From 502133bd3c771425c7df419ccc1cd5463020d0ce Mon Sep 17 00:00:00 2001 From: Sven Thiele Date: Fri, 11 Oct 2024 12:41:49 +0200 Subject: [PATCH] Update tests --- .github/workflows/ci-test.yml | 10 +++++----- Dockerfile_Flatzingo | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 3d0524e..c9c8060 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -10,11 +10,11 @@ jobs: matrix: os: [ubuntu-latest] clingconversion: [5.2.1] - minizincversion: [2.8.3] + minizincversion: [2.8.7] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true @@ -38,7 +38,7 @@ jobs: - name: Install fzn2lp run: | - wget https://github.com/potassco/fzn2lp/releases/download/v0.1.5/fzn2lp-linux-x86_64.tar.gz + wget https://github.com/potassco/fzn2lp/releases/download/v0.1.6/fzn2lp-linux-x86_64.tar.gz tar -xvf fzn2lp-linux-x86_64.tar.gz echo "$(pwd)" >> $GITHUB_PATH - name: Test fzn2lp @@ -57,7 +57,7 @@ jobs: run: python3 -m pytest tests - name: Install minizinc testcases - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: 'MiniZinc/libminizinc' ref: '${{ matrix.minizincversion }}' @@ -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 and not test_vis_ann and not test_vis_custom" --driver=../../MiniZincIDE-${{ matrix.minizincversion }}-bundle-linux-x86_64/bin + pytest -k "not test_output_checker and not test_vis_ann and not test_vis_custom and not test_array_dzn_output and not test_json_section and not test_run_fzn" --driver=../../MiniZincIDE-${{ matrix.minizincversion }}-bundle-linux-x86_64/bin diff --git a/Dockerfile_Flatzingo b/Dockerfile_Flatzingo index a5e6e3b..4ce21aa 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.5 && \ + git checkout v0.1.6 && \ cargo build --release && \ mkdir -p /install/bin && \ cp target/release/fzn2lp /install/bin/