Skip to content

Commit 6fff095

Browse files
authored
Merge pull request NOAA-EMC#142 from jiandewang/feature/update-to-main-20241127
update to main repo. 20250113 commit (20241127-PR)
2 parents 8cc8b70 + 162aad8 commit 6fff095

File tree

154 files changed

+12309
-4962
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+12309
-4962
lines changed

.codecov.yml

+3
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ coverage:
88
default:
99
threshold: 100%
1010
base: parent
11+
12+
fixes:
13+
- "MOM6/::"

.github/actions/ubuntu-setup/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runs:
2323
run: |
2424
echo "::group::config.mk"
2525
cd .testing
26-
echo "FCFLAGS_DEBUG = -g -O0 -Wextra -Wno-compare-reals -fbacktrace -ffpe-trap=invalid,zero,overflow -fcheck=bounds" >> config.mk
26+
echo "FCFLAGS_DEBUG = -g -O0 -std=f2018 -Wextra -Wno-compare-reals -fbacktrace -ffpe-trap=invalid,zero,overflow -fcheck=bounds" >> config.mk
2727
echo "FCFLAGS_REPRO = -g -O2 -fbacktrace" >> config.mk
2828
echo "FCFLAGS_INIT = -finit-real=snan -finit-integer=2147483647 -finit-derived" >> config.mk
2929
echo "FCFLAGS_FMS = -g -fbacktrace -O0" >> config.mk

.github/workflows/coupled-api.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
working-directory: .testing
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
with:
1616
submodules: recursive
1717

.github/workflows/coverage.yml

+5-11
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,19 @@ jobs:
1111
working-directory: .testing
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
with:
1616
submodules: recursive
1717

1818
- uses: ./.github/actions/ubuntu-setup
1919

2020
- uses: ./.github/actions/testing-setup
2121

22-
- name: Compile file parser unit tests
23-
run: make -j build/unit/test_MOM_file_parser
24-
25-
- name: Run file parser unit tests
26-
run: make run.cov.unit
27-
28-
- name: Compile unit testing
22+
- name: Compile unit tests
2923
run: make -j build.unit
3024

31-
- name: Run (single processor) unit tests
32-
run: make run.unit
25+
- name: Run unit tests
26+
run: make run.cov.unit
3327

3428
- name: Report unit test coverage to CI
3529
run: make report.cov.unit
@@ -40,7 +34,7 @@ jobs:
4034
run: make -j build/cov/MOM6
4135

4236
- name: Run coverage tests
43-
run: make -j -k run.cov
37+
run: make -k run.cov
4438

4539
- name: Report coverage to CI
4640
run: make report.cov

.github/workflows/documentation-and-style.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
with:
1313
submodules: recursive
1414

.github/workflows/expression.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
working-directory: .testing
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
with:
1616
submodules: recursive
1717

.github/workflows/macos-regression.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
working-directory: .testing
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
with:
2222
submodules: recursive
2323

.github/workflows/macos-stencil.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
working-directory: .testing
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
with:
2222
submodules: recursive
2323

.github/workflows/other.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
working-directory: .testing
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
with:
1616
submodules: recursive
1717

.github/workflows/perfmon.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
working-directory: .testing
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
with:
1616
submodules: recursive
1717

.github/workflows/regression.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
working-directory: .testing
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
with:
1616
submodules: recursive
1717

.github/workflows/stencil.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
working-directory: .testing
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
with:
1616
submodules: recursive
1717

0 commit comments

Comments
 (0)