Merge branch 'develop'

MiniZinc · Jul 10, 2019 · 09d805b · 09d805b
2 parents 6afe1b3 + cc5fce6
commit 09d805b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -257,7 +257,7 @@ package:docker_ubuntu:
   only: [tags, master, develop]
   tags: [docker-cli]
 
-package:snap:
+.snap_job: &snap_job
   stage: package
   image: dekker1/minibuild:snap
   variables:
@@ -278,5 +278,13 @@ package:snap:
     name: "minizinc_snap_${CI_PIPELINE_ID}"
     paths: [minizinc*.snap]
   dependencies: []
-  only: [tags, develop]
   tags: [linux, docker]
+
+package:snap:
+  <<: *snap_job
+  only: [tag]
+
+package:snap_manual:
+  <<: *snap_job
+  except: [tag]
+  when: manual
diff --git a/resources/solvers/globalizer.msc b/resources/solvers/globalizer.msc
@@ -2,7 +2,7 @@
     "executable": "../../../bin/minizinc-globalizer",
     "id": "org.minizinc.globalizer",
     "isGUIApplication": false,
-    "mznlib": "-Gglobalizer",
+    "mznlib": "../globalizer",
     "name": "Globalizer",
     "supportsMzn": true,
     "version": "0.1.6.0",