From 84cecfc6ab48460d3c205b920db7533bcb13cb16 Mon Sep 17 00:00:00 2001 From: Sven Thiele Date: Tue, 21 May 2024 11:04:55 +0200 Subject: [PATCH 1/4] Update fzn2lp to version 0.1.5 --- .github/workflows/ci-test.yml | 2 +- Dockerfile_Flatzingo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 9075bde..253f3f0 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -35,7 +35,7 @@ jobs: - name: Install fzn2lp run: | - wget https://github.com/potassco/fzn2lp/releases/download/v0.1.4/fzn2lp-linux-x86_64.tar.gz + wget https://github.com/potassco/fzn2lp/releases/download/v0.1.5/fzn2lp-linux-x86_64.tar.gz tar -xvf fzn2lp-linux-x86_64.tar.gz echo "$(pwd)" >> $GITHUB_PATH - name: Test fzn2lp diff --git a/Dockerfile_Flatzingo b/Dockerfile_Flatzingo index 151568e..a5e6e3b 100644 --- a/Dockerfile_Flatzingo +++ b/Dockerfile_Flatzingo @@ -27,7 +27,7 @@ RUN curl https://sh.rustup.rs | bash -s -- -y ENV PATH="/root/.cargo/bin:${PATH}" RUN git clone https://github.com/potassco/fzn2lp.git && \ cd fzn2lp && \ - git checkout v0.1.4 && \ + git checkout v0.1.5 && \ cargo build --release && \ mkdir -p /install/bin && \ cp target/release/fzn2lp /install/bin/ From e5689ddc851d8db56f4793a08355650458e394e3 Mon Sep 17 00:00:00 2001 From: Sven Thiele Date: Tue, 21 May 2024 11:13:06 +0200 Subject: [PATCH 2/4] Change install clingcon installation method --- .github/workflows/ci-test.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 253f3f0..fda0c53 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -15,14 +15,17 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: conda-incubator/setup-miniconda@v3 + with: + auto-update-conda: true + python-version: ${{ matrix.python-version }} - - name: Install clingcon + - name: Conda install clingcon + shell: bash -l {0} run: | - 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 }}-jammy4 + conda install -c "potassco/label/dev" clingcon=${{matrix.clingconversion}} - name: Test clingcon + shell: bash -l {0} run: clingcon --version - name: Install minizinc @@ -48,7 +51,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 }}.post3 + pip3 install --extra-index-url https://test.pypi.org/simple/ clingcon==${{ matrix.clingconversion }}.post4 - name: Test flatzingo run: python3 -m pytest tests @@ -66,6 +69,7 @@ jobs: - name: Prepare minizinc testcases run: sed -i 's/"gecode", "cbc", "chuffed"/"flatzingo"/' libminizinc/tests/minizinc_testing/spec.py - name: Run minizinc tests + shell: bash -l {0} run: | cd libminizinc/tests pytest -k "not test_output_checker and not test_var_set_element and not bug269 and not bug347 and not test-search1" --driver=../../MiniZincIDE-${{ matrix.minizincversion }}-bundle-linux-x86_64/bin From 63db975e462a826af44a301b2cc675e51c2bbf38 Mon Sep 17 00:00:00 2001 From: Sven Thiele Date: Tue, 21 May 2024 11:25:59 +0200 Subject: [PATCH 3/4] Fix minizinc installation --- .github/workflows/ci-test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index fda0c53..9136580 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -10,7 +10,7 @@ jobs: matrix: os: [ubuntu-latest] clingconversion: [5.2.1] - minizincversion: [2.6.3] + minizincversion: [2.8.3] steps: @@ -64,7 +64,6 @@ jobs: path: 'libminizinc' - name: Install minizinc python library and requirements run: | - sed -i 's/develop/0.6.0/' libminizinc/tests/requirements.txt pip3 install -r libminizinc/tests/requirements.txt - name: Prepare minizinc testcases run: sed -i 's/"gecode", "cbc", "chuffed"/"flatzingo"/' libminizinc/tests/minizinc_testing/spec.py From e8c1c96c9a0391ca6dd4ac50d019aa35bfbb5210 Mon Sep 17 00:00:00 2001 From: Sven Thiele Date: Tue, 21 May 2024 11:34:39 +0200 Subject: [PATCH 4/4] Disable ftest_vis_ann and test_vis_custom --- .github/workflows/ci-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 9136580..3d0524e 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -71,5 +71,5 @@ jobs: shell: bash -l {0} run: | cd libminizinc/tests - pytest -k "not test_output_checker and not test_var_set_element and not bug269 and not bug347 and not test-search1" --driver=../../MiniZincIDE-${{ matrix.minizincversion }}-bundle-linux-x86_64/bin + pytest -k "not test_output_checker and not test_var_set_element and not bug269 and not bug347 and not test-search1 and not test_vis_ann and not test_vis_custom" --driver=../../MiniZincIDE-${{ matrix.minizincversion }}-bundle-linux-x86_64/bin