Fix naming conflict of folder/executable in Snapcraft packaging

Author: Dekker1

.gitlab-ci.yml

@@ -2,6 +2,9 @@ stages:
   - build
   - package
 
+default:
+  interruptible: true
+
 # ----------- Build MiniZincIDE -----------
 
 build:linux:
@@ -295,16 +298,15 @@ package:docker_ubuntu:
   script:
     - strip minizinc/bin/minizinc vendor/gecode/bin/fzn-gecode vendor/gecode_gist/bin/fzn-gecode vendor/chuffed/bin/fzn-chuffed findMUS/bin/findMUS globalizer/bin/minizinc-globalizer minizinc/bin/mzn2doc
     - cp resources/pkg_config/snapcraft.yaml .
-    - echo "$MZNVERSION" > version.txt
     - apt-get update -y
+    - snapcraft login --with $SNAPCRAFT_LOGIN
     - snapcraft
-    - echo "$SNAPLOGIN" > login.pass
-    - snapcraft login --with login.pass
-    - snapcraft push --release=edge minizinc*.snap
+    - snapcraft upload minizinc*.snap --release edge
   artifacts:
     name: "minizinc_snap_${CI_PIPELINE_ID}"
     paths: [minizinc*.snap]
   dependencies: []
+  needs: []
   tags: [linux, docker]
 
 package:snap:

resources/pkg_config/snapcraft.yaml

@@ -1,6 +1,5 @@
 name: minizinc
-version: latest
-version-script: cat version.txt
+version: git
 summary: The MiniZinc bundle
 icon: resources/icon.png
 description: |
@@ -27,8 +26,7 @@ parts:
   ide:
     plugin: qmake
     source: .
-    project-files:
-      - MiniZincIDE/MiniZincIDE.pro
+    source-subdir: MiniZincIDE
     qt-version: qt5
     after: [desktop-qt5]
     build-packages: