Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

St/update fzn2lp #50

Merged
merged 4 commits into from
May 21, 2024
Merged

St/update fzn2lp #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84cecfc
Update fzn2lp to version 0.1.5
sthiele May 21, 2024
e5689dd
Change install clingcon installation method
sthiele May 21, 2024
63db975
Fix minizinc installation
sthiele May 21, 2024
e8c1c96
Disable ftest_vis_ann and test_vis_custom
sthiele May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions .github/workflows/ci-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,22 @@ jobs:
matrix:
os: [ubuntu-latest]
clingconversion: [5.2.1]
minizincversion: [2.6.3]
minizincversion: [2.8.3]


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
Expand All @@ -35,7 +38,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
Expand All @@ -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
Expand All @@ -61,12 +64,12 @@ 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
- 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
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

2 changes: 1 addition & 1 deletion Dockerfile_Flatzingo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
Loading