From d2b8d7d2d23d964a3dda475cc560570fe5409613 Mon Sep 17 00:00:00 2001
From: Max Ostrowski <max.ostrowski@potassco.com>
Date: Wed, 19 Apr 2023 10:29:04 +0200
Subject: [PATCH] Fixparallel (#48)

* fix missing -p option for minizinc executable

* update clingcon
---
 .github/workflows/ci-test.yml | 6 +++---
 Dockerfile_Flatzingo          | 4 ++--
 configuration/docker.msc      | 4 ++--
 configuration/flatzingo.msc   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index e60853b..9075bde 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-test.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        clingconversion: [5.1.0]
+        clingconversion: [5.2.1]
         minizincversion: [2.6.3]
 
     
@@ -21,7 +21,7 @@ jobs:
         sudo add-apt-repository ppa:potassco/stable
         sudo add-apt-repository ppa:potassco/wip
         sudo apt-get update
-        sudo apt-get install clingcon=${{ matrix.clingconversion }}-focal6
+        sudo apt-get install clingcon=${{ matrix.clingconversion }}-jammy4
     - name: Test clingcon
       run: clingcon --version
 
@@ -48,7 +48,7 @@ jobs:
       run: |
         sudo apt-get install -y python3-pip
         pip3 install pytest
-        pip3 install --extra-index-url https://test.pypi.org/simple/ clingcon==${{ matrix.clingconversion }}.post5
+        pip3 install --extra-index-url https://test.pypi.org/simple/ clingcon==${{ matrix.clingconversion }}.post3
 
     - name: Test flatzingo
       run: python3 -m pytest tests
diff --git a/Dockerfile_Flatzingo b/Dockerfile_Flatzingo
index 20e1354..151568e 100644
--- a/Dockerfile_Flatzingo
+++ b/Dockerfile_Flatzingo
@@ -47,8 +47,8 @@ ENV PATH="/install/bin:${PATH}"
 RUN apt-get update -y && apt-get install software-properties-common -y && \
     add-apt-repository ppa:deadsnakes/ppa && \
     add-apt-repository ppa:potassco/wip && \
-    apt-get install -y python3-pip clingcon=5.1.0-focal6 && \
-    pip3 install --extra-index-url https://test.pypi.org/simple/ clingcon==5.1.0-post5
+    apt-get install -y python3-pip clingcon=5.2.1-focal4 && \
+    pip3 install --extra-index-url https://test.pypi.org/simple/ clingcon==5.2.1-post3
 
 # Copy fzn2lp's executable from the previous stage across
 COPY --from=builder /install /install
diff --git a/configuration/docker.msc b/configuration/docker.msc
index db34e62..6582f06 100644
--- a/configuration/docker.msc
+++ b/configuration/docker.msc
@@ -2,11 +2,11 @@
   "id": "org.potassco.flatzingo",
   "name": "Flatzingo",
   "description": "Flatzingo FlatZinc executable",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "mznlib": "flatzingo-lib",
   "executable": "fzn-flatzingo.sh",
   "tags": ["cp","lcg","int"],
-  "stdFlags": ["-a","-f","-n","-r","-s","-t","-v"],
+  "stdFlags": ["-a","-f","-n","-r","-s","-t","-v","-p"],
   "supportsMzn": false,
   "supportsFzn": true,
   "needsSolns2Out": true,
diff --git a/configuration/flatzingo.msc b/configuration/flatzingo.msc
index 06acf40..aad3243 100644
--- a/configuration/flatzingo.msc
+++ b/configuration/flatzingo.msc
@@ -2,11 +2,11 @@
   "id": "org.potassco.flatzingo",
   "name": "Flatzingo",
   "description": "Flatzingo FlatZinc executable",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "mznlib": "../share/flatzingo",
   "executable": "fzn-flatzingo.sh",
   "tags": ["cp","lcg","int"],
-  "stdFlags": ["-a","-f","-n","-r","-s","-t","-v"],
+  "stdFlags": ["-a","-f","-n","-r","-s","-t","-v","-p"],
   "supportsMzn": false,
   "supportsFzn": true,
   "needsSolns2Out": true,