Skip to content

Commit

Permalink
Fixparallel (#48)
Browse files Browse the repository at this point in the history
* fix missing -p option for minizinc executable

* update clingcon
  • Loading branch information
MaxOstrowski authored Apr 19, 2023
1 parent 306de9e commit d2b8d7d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
clingconversion: [5.1.0]
clingconversion: [5.2.1]
minizincversion: [2.6.3]


Expand All @@ -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

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile_Flatzingo
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configuration/docker.msc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions configuration/flatzingo.msc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit d2b8d7d

Please sign in to comment.