Skip to content

Commit 09d805b

Browse files
committed
Merge branch 'develop'
2 parents 6afe1b3 + cc5fce6 commit 09d805b

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.gitlab-ci.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ package:docker_ubuntu:
257257
only: [tags, master, develop]
258258
tags: [docker-cli]
259259

260-
package:snap:
260+
.snap_job: &snap_job
261261
stage: package
262262
image: dekker1/minibuild:snap
263263
variables:
@@ -278,5 +278,13 @@ package:snap:
278278
name: "minizinc_snap_${CI_PIPELINE_ID}"
279279
paths: [minizinc*.snap]
280280
dependencies: []
281-
only: [tags, develop]
282281
tags: [linux, docker]
282+
283+
package:snap:
284+
<<: *snap_job
285+
only: [tag]
286+
287+
package:snap_manual:
288+
<<: *snap_job
289+
except: [tag]
290+
when: manual

resources/solvers/globalizer.msc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"executable": "../../../bin/minizinc-globalizer",
33
"id": "org.minizinc.globalizer",
44
"isGUIApplication": false,
5-
"mznlib": "-Gglobalizer",
5+
"mznlib": "../globalizer",
66
"name": "Globalizer",
77
"supportsMzn": true,
88
"version": "0.1.6.0",

0 commit comments

Comments
 (0)