Merge branch 'develop'

Author: guidotack

.gitlab-ci.yml

@@ -104,6 +104,7 @@ package:linux:
     name: "minizinc_bundle_linux_${CI_PIPELINE_ID}"
     paths: [MiniZincIDE*.tgz, MiniZincIDE*.sha256]
   dependencies: ["build:linux"]
+  needs: ["build:linux"]
   tags: [linux, docker]
 
 package:osx:
@@ -142,6 +143,7 @@ package:osx:
     name: "minizinc_bundle_mac_${CI_PIPELINE_ID}"
     paths: [MiniZincIDE.app]
   dependencies: ["build:osx"]
+  needs: ["build:osx"]
   tags: [osx, qt]
 
 package:win64:
@@ -174,6 +176,7 @@ package:win64:
     name: "minizinc_bundle_windows_%CI_PIPELINE_ID%"
     paths: [MiniZincIDE*.exe, MiniZincIDE*.sha256]
   dependencies: ["build:win64"]
+  needs: ["build:win64"]
   tags: [win64]
 
 package:appimage:
@@ -222,37 +225,47 @@ package:appimage:
     name: "minizinc_appimage_${CI_PIPELINE_ID}"
     paths: [MiniZincIDE*.AppImage, MiniZincIDE*.sha256]
   dependencies: ["build:linux"]
+  needs: ["build:linux"]
   tags: [linux, docker]
 
 package:docker_alpine:
   stage: package
+  parallel: 4
   variables:
     MZNARCH: "musl"
   <<: *packaging_setup
   script:
-    - docker build -f resources/pkg_config/alpine.Dockerfile -t minizinc_alpine .
-    - if [ -n "$CI_COMMIT_TAG" ]; then docker tag minizinc_alpine minizinc/minizinc:$CI_COMMIT_TAG && docker push minizinc/minizinc:$CI_COMMIT_TAG; fi
-    - if [ "$CI_COMMIT_REF_NAME" = "master" ]; then docker tag minizinc_alpine minizinc/minizinc:latest && docker push minizinc/minizinc:latest; fi
-    - if [ "$CI_COMMIT_REF_NAME" = "develop" ]; then docker tag minizinc_alpine minizinc/minizinc:edge && docker push minizinc/minizinc:edge; fi
+    - BASES=("null" "alpine:latest" "alpine:3.10" "alpine:3.9" "alpine:3.8")
+    - EXTS=("null" "-alpine" "-alpine3.10" "-alpine3.9" "-alpine3.8")
+    - echo "Building image based on \"${BASES[$CI_NODE_INDEX]}\" with tag extension \"${EXTS[$CI_NODE_INDEX]}\""
+    - HASH="$(docker build -f resources/pkg_config/Dockerfile --build-arg BASE=${BASES[$CI_NODE_INDEX]} -q .)"
+    - if [ -n "$CI_COMMIT_TAG" ]; then docker tag ${HASH} minizinc/minizinc:${CI_COMMIT_TAG}${EXTS[$CI_NODE_INDEX]} && docker push minizinc/minizinc:${CI_COMMIT_TAG}${EXTS[$CI_NODE_INDEX]}; fi
+    - if [ "$CI_COMMIT_REF_NAME" = "master" ]; then docker tag ${HASH} minizinc/minizinc:latest${EXTS[$CI_NODE_INDEX]} && docker push minizinc/minizinc:latest${EXTS[$CI_NODE_INDEX]}; fi
+    - if [ "$CI_COMMIT_REF_NAME" = "develop" ]; then docker tag ${HASH} minizinc/minizinc:edge${EXTS[$CI_NODE_INDEX]} && docker push minizinc/minizinc:edge${EXTS[$CI_NODE_INDEX]}; fi
   dependencies: []
   only: [tags, master, develop]
   tags: [docker-cli]
 
 package:docker_ubuntu:
   stage: package
+  parallel: 3
   variables:
     MZNARCH: "linux"
     DOWNLOAD_SOLVERS: 0
   <<: *packaging_setup
   script:
+    - BASES=("null" "ubuntu:latest" "ubuntu:bionic" "ubuntu:xenial")
+    - EXTS=("null" "" "-bionic" "-xenial")
+    - echo "Building image based on \"${BASES[$CI_NODE_INDEX]}\" with tag extension \"${EXTS[$CI_NODE_INDEX]}\""
     - curl --silent -o gecode.zip --location --header "PRIVATE-TOKEN:$ACCESS_TOKEN" "https://gitlab.com/api/v4/projects/minizinc%2Fvendor/jobs/artifacts/master/download?job=gecode:$MZNARCH"
     - unzip -q gecode.zip
     - curl --silent -o chuffed.zip --location --header "PRIVATE-TOKEN:$ACCESS_TOKEN" "https://gitlab.com/api/v4/projects/minizinc%2Fvendor/jobs/artifacts/master/download?job=chuffed:$MZNARCH"
     - unzip -q chuffed.zip
-    - docker build -f resources/pkg_config/ubuntu.Dockerfile -t minizinc_ubuntu .
-    - if [ -n "$CI_COMMIT_TAG" ]; then docker tag minizinc_ubuntu minizinc/minizinc:ubuntu_$CI_COMMIT_TAG && docker push minizinc/minizinc:ubuntu_$CI_COMMIT_TAG; fi
-    - if [ "$CI_COMMIT_REF_NAME" = "master" ]; then docker tag minizinc_ubuntu minizinc/minizinc:ubuntu_latest && docker push minizinc/minizinc:ubuntu_latest; fi
-    - if [ "$CI_COMMIT_REF_NAME" = "develop" ]; then docker tag minizinc_ubuntu minizinc/minizinc:ubuntu_edge && docker push minizinc/minizinc:ubuntu_edge; fi
+    - HASH="$(docker build -f resources/pkg_config/Dockerfile --build-arg BASE=${BASES[$CI_NODE_INDEX]} -q .)"
+    - echo $HASH 
+    - if [ -n "$CI_COMMIT_TAG" ]; then docker tag ${HASH} minizinc/minizinc:${CI_COMMIT_TAG}${EXTS[$CI_NODE_INDEX]} && docker push minizinc/minizinc:${CI_COMMIT_TAG}${EXTS[$CI_NODE_INDEX]}; fi
+    - if [ "$CI_COMMIT_REF_NAME" = "master" ]; then docker tag ${HASH} minizinc/minizinc:latest${EXTS[$CI_NODE_INDEX]} && docker push minizinc/minizinc:latest${EXTS[$CI_NODE_INDEX]}; fi
+    - if [ "$CI_COMMIT_REF_NAME" = "develop" ]; then docker tag ${HASH} minizinc/minizinc:edge${EXTS[$CI_NODE_INDEX]} && docker push minizinc/minizinc:edge${EXTS[$CI_NODE_INDEX]}; fi
   dependencies: []
   only: [tags, master, develop]
   tags: [docker-cli]

MiniZincIDE/CHANGES

@@ -1,3 +1,6 @@
+2019-09-12
+  v2.3.2
+  - Update to MiniZinc 2.3.2.
 2019-07-10
   v2.3.1
   - Remove incorrect symbolic link and fix qt.conf for some bundled distributions.

MiniZincIDE/MiniZincIDE.pro

@@ -19,7 +19,7 @@ greaterThan(QT_MAJOR_VERSION, 4): {
 TARGET = MiniZincIDE
 TEMPLATE = app
 
-VERSION = 2.3.1
+VERSION = 2.3.2
 DEFINES += MINIZINC_IDE_VERSION=\\\"$$VERSION\\\"
 
 bundled {

resources/pkg_config/alpine.Dockerfile renamed to resources/pkg_config/Dockerfile

@@ -1,4 +1,5 @@
-FROM alpine:latest AS composer
+ARG BASE=ubuntu:latest
+FROM ${BASE} AS composer
 
 # Install MiniZinc toolchain
 COPY minizinc/bin/* /usr/local/bin/
@@ -17,13 +18,13 @@ COPY resources/solvers/chuffed.msc /usr/local/share/minizinc/solvers/
 COPY resources/Preferences.json /usr/local/share/minizinc/
 
 # Strip all binaries
-RUN apk add --no-cache binutils
+RUN [ -f "/etc/alpine-release" ] && apk add --no-cache binutils || (apt-get update -y && apt-get install -y binutils)
 RUN cd /usr/local/bin && strip minizinc mzn2doc fzn-chuffed fzn-gecode
 
 # Generate resulting Docker image
-FROM alpine:latest
+FROM ${BASE} 
 
-RUN apk add --no-cache libstdc++
+RUN [ ! -f "/etc/alpine-release" ] || apk add --no-cache libstdc++
 
 COPY --from=composer /usr/local/bin/* /usr/local/bin/
 COPY --from=composer /usr/local/share/minizinc /usr/local/share/minizinc