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

Test on macos #504

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Test on macos #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc3ff43
Setup to test on macos
rs028 Sep 14, 2023
1d570c3
Run only model tests and show log
rs028 Sep 23, 2023
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
30 changes: 15 additions & 15 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 modeltests # NB: modeltests are temporarily deactivated (pass on linux, fail on macos)
#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
Expand Down
1 change: 1 addition & 0 deletions tests/run_model_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading