Skip to content

Commit 746c90c

Browse files
mergify[bot]mergify[bot]
authored
Merge pull request #3115 from jgfouca/upstream_merge_2024_11_14
Automatically merged using mergify PR title: Jgfouca/upstream merge 2024 11 14 PR author: jgfouca PR labels: ['CI: workflow change approved', 'CI: automerge']
2 parents 90ef094 + 03ab712 commit 746c90c

File tree

221 files changed

+5039
-2011
lines changed

Some content is hidden

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

221 files changed

+5039
-2011
lines changed

‎.github/workflows/e3sm-gh-ci-cime-tests.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@ on:
2222

2323
workflow_dispatch:
2424

25+
concurrency:
26+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
27+
cancel-in-progress: true
28+
2529
jobs:
2630

2731
ci:
28-
if: false
32+
if: ${{ github.repository == 'E3SM-Project/E3SM' }}
2933
runs-on: ubuntu-latest
3034
strategy:
3135
fail-fast: false
@@ -36,7 +40,7 @@ jobs:
3640
- SMS_D_Ln5_P4.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.ghci-oci_gnu
3741
- ERS_Ld5_P4.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.ghci-oci_gnu.eamxx-prod
3842
container:
39-
image: ghcr.io/e3sm-project/containers-ghci:ghci-0.1.0
43+
image: ghcr.io/e3sm-project/containers-ghci:ghci-0.2.0
4044

4145
steps:
4246
-

‎.github/workflows/e3sm-gh-ci-w-cime-tests.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: gh
1+
name: gh-w
22

33
on:
44
pull_request:
@@ -11,10 +11,14 @@ on:
1111

1212
workflow_dispatch:
1313

14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
16+
cancel-in-progress: true
17+
1418
jobs:
1519

16-
ci-w:
17-
if: ${{ github.event.repository.name == 'e3sm' }}
20+
ci:
21+
if: ${{ github.repository == 'E3SM-Project/E3SM' }}
1822
runs-on: ubuntu-latest
1923
strategy:
2024
fail-fast: false
@@ -23,7 +27,7 @@ jobs:
2327
- SMS_D_Ld1_P8.ne4pg2_oQU480.WCYCL2010NS.ghci-oci_gnu
2428
- ERS_Ld3_P8.ne4pg2_oQU480.WCYCL2010NS.ghci-oci_gnu.allactive-wcprod_1850
2529
container:
26-
image: ghcr.io/e3sm-project/containers-ghci:ghci-0.1.0
30+
image: ghcr.io/e3sm-project/containers-ghci:ghci-0.2.0
2731

2832
steps:
2933
-

‎.github/workflows/e3sm-gh-md-linter.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@ on:
1010
# for now let's not lint files in eamxx
1111
- '!components/eamxx/**/*.md'
1212

13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
15+
cancel-in-progress: true
16+
1317
jobs:
1418
linter:
19+
if: ${{ github.repository == 'E3SM-Project/E3SM' }}
1520
runs-on: ubuntu-latest
1621
steps:
1722
- uses: actions/checkout@v4

‎.github/workflows/e3sm-gh-pages.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515

1616
jobs:
1717
Build-and-Deploy-docs:
18-
if: ${{ github.event.repository.name == 'e3sm' }}
18+
if: ${{ github.repository == 'E3SM-Project/E3SM' }}
1919
runs-on: ubuntu-latest
2020
steps:
2121
- uses: actions/checkout@v4

‎.github/workflows/e3sm-gh-tools-mkatmsrffile-test.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@ on:
1111
- cron: '00 15 * * 2'
1212
workflow_dispatch:
1313

14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
16+
cancel-in-progress: true
17+
1418
jobs:
1519
mkatmsrffile-test:
20+
if: ${{ github.repository == 'E3SM-Project/E3SM' }}
1621
runs-on: ubuntu-latest
1722
defaults:
1823
run:
@@ -31,18 +36,15 @@ jobs:
3136
uses: conda-incubator/setup-miniconda@v3
3237
with:
3338
activate-environment: "envmkatmsrffile"
34-
miniforge-variant: Mambaforge
3539
miniforge-version: latest
36-
use-mamba: true
37-
mamba-version: "*"
3840
channel-priority: strict
3941
auto-update-conda: true
4042
python-version: 3.11
4143
-
4244
name: Install dependencies
4345
run: |
4446
echo $CONDA_PREFIX
45-
mamba install -y nco xarray numba numpy netcdf4
47+
conda install -y nco xarray numba numpy netcdf4 -c conda-forge
4648
-
4749
name: Run tests
4850
working-directory: components/eam/tools/mkatmsrffile

‎.github/workflows/eamxx-gh-ci-standalone.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: gh-standalone
2+
3+
on:
4+
pull_request:
5+
branches: [ master ]
6+
paths:
7+
# first, yes to these
8+
- '.github/workflows/eamxx-gh-ci-standalone.yml'
9+
- 'cime_config/machine/config_machines.xml'
10+
- 'components/eamxx/**'
11+
- 'components/homme/**'
12+
# second, no to these
13+
- '!components/eamxx/docs/**'
14+
- '!components/eamxx/mkdocs.yml'
15+
16+
workflow_dispatch:
17+
18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
20+
cancel-in-progress: true
21+
22+
jobs:
23+
24+
ci:
25+
if: ${{ github.repository == 'E3SM-Project/E3SM' }}
26+
runs-on: ubuntu-latest
27+
strategy:
28+
fail-fast: false
29+
matrix:
30+
test:
31+
- sp
32+
- opt
33+
- dbg
34+
- fpe
35+
container:
36+
image: ghcr.io/e3sm-project/containers-standalone-ghci:standalone-ghci-0.1.0
37+
38+
steps:
39+
-
40+
name: Checkout
41+
uses: actions/checkout@v4
42+
with:
43+
show-progress: false
44+
submodules: recursive
45+
-
46+
name: standalone
47+
env:
48+
SHELL: sh
49+
run: |
50+
# TODO: get rid of this extra line if we can?
51+
git config --global safe.directory '*'
52+
./components/eamxx/scripts/test-all-scream -m ghci-oci -t ${{ matrix.test }} -c BUILD_SHARED_LIBS=ON
53+
-
54+
name: Artifacts
55+
uses: actions/upload-artifact@v4
56+
if: ${{ always() }}
57+
with:
58+
name: ${{ matrix.test }}
59+
path: |
60+
components/eamxx/ctest-build/*/Testing/Temporary/Last*.log

‎.github/workflows/eamxx-gh-pages.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ concurrency:
3434
jobs:
3535

3636
eamxx-docs:
37-
if: ${{ github.event.repository.name == 'scream' }}
37+
if: ${{ github.repository == 'E3SM-Project/scream' }}
3838
runs-on: ubuntu-latest
3939

4040
steps:

‎.github/workflows/eamxx_default_files.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@ on:
1111
- cron: '00 00 * * *'
1212
workflow_dispatch:
1313

14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
16+
cancel-in-progress: true
17+
1418
jobs:
1519
scream-defaults:
16-
if: false
20+
if: ${{ github.repository == 'E3SM-Project/E3SM' }}
1721
runs-on: ubuntu-latest
1822
outputs:
1923
event_name: ${{ github.event_name }}

‎CITATION.cff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ authors:
99
- given-names: E3SM
1010
family-names: Project
1111
version: 3.0.0
12-
doi: 10.11578/E3SM/dc.20240301.3
12+
doi: 10.11578/E3SM/dc.20240930.1
1313
repository-code: 'https://github.com/E3SM-Project/E3SM'
1414
url: 'https://e3sm.org'
1515
license: BSD-3-Clause

‎LICENSE‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Except for the separable pieces descibed below, E3SM is released
22
under the following 3-Clause BSD Open Source license.
33

44
*******************************************************************************
5-
Copyright ©2023, UChicago Argonne, LLC All Rights Reserved
5+
Copyright 2024, UChicago Argonne, LLC All Rights Reserved
66

77
Software Name: Energy Exascale Earth System Model (E3SM)
88

@@ -55,15 +55,29 @@ GPTL share/timing author non-commeric
5555
MCT externals/mct ANL BSD
5656
YAKL externals/YAKL author BSD
5757
cub externals/cub author, NVIDIA BSD
58-
kokkos externals/kokkos SNL BSD
58+
kokkos externals/ekat SNL BSD
59+
haero externals/haero SNL/Battelle BSD
60+
mam4xx externals/mam4xx SNL/Battelle BSD
5961

6062
Ocean/Ice under components/
6163
----------- -----------------
6264
CICE cice LANL BSD
6365
MPAS Framework mpas-framework LANL BSD
64-
MPAS Ocean mpas-ocean LANL BSD
65-
MPAS SeaIce mpas-seaice LANL BSD
66-
MPAS-Albany LandIce mpas-albany-landice LANL, SNL BSD
66+
FFTW mpas-ocean/src/FFTW author/MIT GPL
67+
MARBL mpas-ocean/src/MARBL NCAR BSD
68+
SHTNS mpas-ocean/src/SHTNS CeCILL GPL
69+
cvmix mpas-ocean/src/cvmix NCAR LGPL
70+
gotm mpas-ocean/src/gotm authors GPL
71+
ppr mpas-ocean/src/ppr author custom
72+
Icepack mpas-seaice/src/icepack LANL BSD
73+
74+
Waves under components/ww3
75+
----------- --------------------
76+
WW3 src/WW3 NWS/NOAA custom
77+
78+
Land-ice under components/mpas-albany-landice
79+
----------- ------------------------------------
80+
SeaLevelModel src/SeaLevelModel author MIT
6781

6882
Land under components/elm/src
6983
----------- ------------------------
@@ -91,7 +105,7 @@ HOMMEXX components/homme/src/share/cxx SNL BSD
91105

92106
Actual copyright holder for above Institutions:
93107
NCAR = University Corporation for Atmospheric Research
94-
LANL = Los Alamos National Security, LLC
108+
LANL = Los Alamos National Security, LLC, Triad National Security, LLC
95109
SNL = National Technology & Engineering Solutions of Sandia, LLC
96110
LBNL = The Regents of the University of California,
97111
through Lawrence Berkeley National Laboratory

0 commit comments

Comments
 (0)