Skip to content

Commit 8a82deb

Browse files
committed
Adapt CI to external configuration
1 parent cd24f8b commit 8a82deb

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

.github/actions/invariance_tests/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ runs:
2020
shell: bash
2121

2222
- name: Run invariance tests
23-
run: python -m INCHI-1-TEST.run_tests invariance ci
23+
run: run-tests --test-config=INCHI-1-TEST/config/config.invariance.py --data-config=INCHI-1-TEST/config/config.ci.py
2424
shell: bash
2525

2626
- name: Write invariance summary
2727
if: '!cancelled()'
28-
run: python -m INCHI-1-TEST.parse_log invariance ci
28+
run: parse-log --test-config=INCHI-1-TEST/config/config.invariance.py --data-config=INCHI-1-TEST/config/config.ci.py
2929
shell: bash
3030

3131
- name: Upload invariance test results

.github/actions/regression_tests/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ runs:
2020
shell: bash
2121

2222
- name: Run regression tests
23-
run: python -m INCHI-1-TEST.run_tests regression ci
23+
run: run-tests --test-config=INCHI-1-TEST/config/config.regression.py --data-config=INCHI-1-TEST/config/config.ci.py
2424
shell: bash
2525

2626
- name: Write regression summary
2727
if: '!cancelled()'
28-
run: python -m INCHI-1-TEST.parse_log regression ci
28+
run: parse-log --test-config=INCHI-1-TEST/config/config.regression.py --data-config=INCHI-1-TEST/config/config.ci.py
2929
shell: bash
3030

3131
- name: Upload regression test results

.github/workflows/ci.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ jobs:
2121
run: |
2222
python -m pip install --upgrade pip
2323
python -m pip install -e INCHI-1-TEST[invariance-tests]
24+
- name: Compile InChI library from triggering branch
25+
# https://github.com/actions/runner-images/issues/6775
26+
run: |
27+
mkdir "$GITHUB_WORKSPACE/INCHI-1-TEST/libs"
28+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
29+
./INCHI-1-TEST/compile_inchi_lib.sh ${{ github.ref_name }} "$GITHUB_WORKSPACE/INCHI-1-TEST/libs"
2430
- uses: ./.github/actions/regression_tests
2531
with:
2632
artifact-name: regression-test-results_glibc_gcc
@@ -38,10 +44,12 @@ jobs:
3844
container: alpine:edge
3945

4046
steps:
41-
- uses: actions/checkout@v4
4247
- name: Install build and test environment
4348
run: |
4449
apk add bash git musl-dev gcc make python3 py-pip
50+
# We need to install git before checking out the repository.
51+
# Otherwise, the repository will be downloaded using the GitHub REST API instead of git.
52+
- uses: actions/checkout@v4
4553
- name: Show Python version
4654
run: |
4755
python --version
@@ -56,6 +64,12 @@ jobs:
5664
run: |
5765
python -m pip install --upgrade pip
5866
python -m pip install -e INCHI-1-TEST
67+
- name: Compile InChI library from triggering branch
68+
# https://github.com/actions/runner-images/issues/6775
69+
run: |
70+
mkdir "$GITHUB_WORKSPACE/INCHI-1-TEST/libs"
71+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
72+
./INCHI-1-TEST/compile_inchi_lib.sh ${{ github.ref_name }} "$GITHUB_WORKSPACE/INCHI-1-TEST/libs"
5973
- uses: ./.github/actions/regression_tests
6074
with:
6175
artifact-name: regression-test-results_musl_gcc

0 commit comments

Comments
 (0)