Skip to content

Commit

Permalink
Merge pull request NOAA-EMC#102 from jiandewang/feature/update-to-mai…
Browse files Browse the repository at this point in the history
…n-20220820

update to MOM6 20220820 main branch
  • Loading branch information
jiandewang authored Aug 24, 2022
2 parents 55e0472 + d077295 commit af12e89
Show file tree
Hide file tree
Showing 101 changed files with 3,760 additions and 1,642 deletions.
4 changes: 0 additions & 4 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,3 @@ coverage:
default:
threshold: 100%
base: parent
comment:
# This is set to the number of TCs, plus unit, but can be removed
# (i.e. set to 1) when reporting is separated from coverage.
after_n_builds: 9
2 changes: 1 addition & 1 deletion .github/actions/testing-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ runs:
run: |
echo "::group::Compile FMS library"
cd .testing
make deps/lib/libFMS.a -s -j
REPORT_ERROR_LOGS=true make deps/lib/libFMS.a -s -j
echo "::endgroup::"
- name: Store compiler flags used in Makefile
Expand Down
31 changes: 22 additions & 9 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@ name: Code coverage
on: [push, pull_request]

jobs:
build-test-nans:
build-coverage:

runs-on: ubuntu-latest
defaults:
run:
working-directory: .testing

env:
REPORT_COVERAGE: true

steps:
- uses: actions/checkout@v2
with:
Expand All @@ -23,13 +20,29 @@ jobs:
- uses: ./.github/actions/testing-setup

- name: Compile unit testing
run: make -j build/unit/MOM6
run: make -j build/unit/MOM_unit_tests

- name: Run unit tests
run: make unit.cov.upload
run: make run.cov.unit

- name: Report unit test coverage to CI (PR)
if: github.event_name == 'pull_request'
run: make report.cov.unit REQUIRE_COVERAGE_UPLOAD=true

- name: Report unit test coverage to CI (Push)
if: github.event_name != 'pull_request'
run: make report.cov.unit

- name: Compile MOM6 with code coverage
- name: Compile ocean-only MOM6 with code coverage
run: make -j build/cov/MOM6

- name: Run and post coverage
run: make run.cov -k -s
- name: Run coverage tests
run: make -j -k run.cov

- name: Report coverage to CI (PR)
if: github.event_name == 'pull_request'
run: make report.cov REQUIRE_COVERAGE_UPLOAD=true

- name: Report coverage to CI (Push)
if: github.event_name != 'pull_request'
run: make report.cov
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "pkg/CVMix-src"]
path = pkg/CVMix-src
url = https://github.com/CVMix/CVMix-src.git
url = https://github.com/mom-ocean/CVMix-src.git
[submodule "pkg/GSW-Fortran"]
path = pkg/GSW-Fortran
url = https://github.com/TEOS-10/GSW-Fortran.git
url = https://github.com/mom-ocean/GSW-Fortran.git
Loading

0 comments on commit af12e89

Please sign in to comment.