From dc3ff43ec4e107d0b7fad6cba4ee53d6fa1d71e9 Mon Sep 17 00:00:00 2001 From: rs028 Date: Thu, 14 Sep 2023 15:42:07 +0000 Subject: [PATCH 1/2] Setup to test on macos --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f4afbd6..16eaa3fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04, macos-11] #, macos-12] + os: [macos-11] #, macos-12] fortran: [9, 10, 11] # exclude: #TODO: fortran9 does not work on macos12 # - os: macos-12 @@ -129,7 +129,7 @@ jobs: export PATH=$PATH:$PWD/numdiff/bin make unittests make oldtests # NB: oldtests will eventually be merged into modeltests - #make modeltests # NB: modeltests are temporarily deactivated (pass on linux, fail on macos) + make modeltests # NB: modeltests are temporarily deactivated (pass on linux, fail on macos) # ------------------------------------------------------------- # (5) Recompile AtChem2 using the code coverage flags, then From 1d570c3cd1e7d1c8625f77c71e0816d2c3cd14a1 Mon Sep 17 00:00:00 2001 From: rs028 Date: Sat, 23 Sep 2023 13:50:51 +0000 Subject: [PATCH 2/2] Run only model tests and show log --- .github/workflows/ci.yml | 26 +++++++++++++------------- tests/run_model_tests.sh | 1 + 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16eaa3fb..356b3f2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,25 +127,25 @@ jobs: FORT_VERSION: ${{ matrix.fortran }} run: | export PATH=$PATH:$PWD/numdiff/bin - make unittests - make oldtests # NB: oldtests will eventually be merged into modeltests + #make unittests + #make oldtests # NB: oldtests will eventually be merged into modeltests make modeltests # NB: modeltests are temporarily deactivated (pass on linux, fail on macos) # ------------------------------------------------------------- # (5) Recompile AtChem2 using the code coverage flags, then # upload the gcov files to Codecov - - name: Unit and Model tests (x Codecov) - if: matrix.os == 'ubuntu-22.04' && matrix.fortran == 11 - # Set $FORT_VERSION for use with the `Makefile` - env: - FORT_VERSION: ${{ matrix.fortran }} - run: | - export PATH=$PATH:$PWD/numdiff/bin - make clean - make unittests CCOV=true - mv tests/unit_tests/*.gc* ./ # Needed to deal with gcc11 changing the way it handles gcda and gcna files - make modeltests CCOV=true # Run only the new model Testsuite + # - name: Unit and Model tests (x Codecov) + # if: matrix.os == 'ubuntu-22.04' && matrix.fortran == 11 + # # Set $FORT_VERSION for use with the `Makefile` + # env: + # FORT_VERSION: ${{ matrix.fortran }} + # run: | + # export PATH=$PATH:$PWD/numdiff/bin + # make clean + # make unittests CCOV=true + # mv tests/unit_tests/*.gc* ./ # Needed to deal with gcc11 changing the way it handles gcda and gcna files + # make modeltests CCOV=true # Run only the new model Testsuite - name: Upload coverage reports to Codecov if: matrix.os == 'ubuntu-22.04' && matrix.fortran == 11 diff --git a/tests/run_model_tests.sh b/tests/run_model_tests.sh index 92e82a78..ae4481a5 100755 --- a/tests/run_model_tests.sh +++ b/tests/run_model_tests.sh @@ -232,4 +232,5 @@ echo "" >> $LOG_FILE echo "Execution of model tests script finished." >> $LOG_FILE echo "==> Model tests logfile:" $LOG_FILE + exit $model_tests_passed