From 99a39c1b6a7c5eb4f11e9dcbd5a6af6afa2b5eb2 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Fri, 24 Feb 2023 11:36:06 -0300 Subject: [PATCH] [Tests] Choose 7.0 if nightly image - Not 6.0.11 --- .github/workflows/pythonapp.yml | 2 ++ g1.sh | 3 +++ g2.sh | 3 +++ g3.sh | 3 +++ 4 files changed, 11 insertions(+) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 91ca481d..12043250 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -46,6 +46,8 @@ jobs: # exit-zero treats all errors as warnings. flake8 . --count --exit-zero --statistics - name: Test ${{ matrix.ki_release }} + env: + KI_RELEASE: ${{ matrix.ki_release }} run: | rm -rf output rm -f tests/.local diff --git a/g1.sh b/g1.sh index ad9deebc..ede2f0a9 100755 --- a/g1.sh +++ b/g1.sh @@ -1,3 +1,6 @@ #!/bin/sh +if [ $KI_RELEASE == "nightly" ]; then + export KIAUS_USE_NIGHTLY="7.0" +fi # Fast tests pytest-3 -v --durations=0 -m "not slow" -n 2 --test_dir=output diff --git a/g2.sh b/g2.sh index 0087cd95..0238d41b 100755 --- a/g2.sh +++ b/g2.sh @@ -1,4 +1,7 @@ #!/bin/sh +if [ $KI_RELEASE == "nightly" ]; then + export KIAUS_USE_NIGHTLY="7.0" +fi set -e # Eeschema tests pytest-3 -v --durations=0 -m "eeschema" --test_dir=output diff --git a/g3.sh b/g3.sh index 226cb23a..cb9bc959 100755 --- a/g3.sh +++ b/g3.sh @@ -1,3 +1,6 @@ #!/bin/sh +if [ $KI_RELEASE == "nightly" ]; then + export KIAUS_USE_NIGHTLY="7.0" +fi # PCBnew tests pytest-3 -v --durations=0 -m "pcbnew" --test_dir=output