Skip to content

Commit

Permalink
Merge branch 'mahf708/ig/maint-3.0-gh-ci' in to maint-3.0 (PR #6707)
Browse files Browse the repository at this point in the history
Activate gh/ci workflows on maint-3.0.

[BFB]
  • Loading branch information
rljacob authored Oct 27, 2024
2 parents 812c88c + 99165ed commit 019bc13
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 15 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/e3sm-gh-ci-cime-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: gh

on:
pull_request:
branches: [ master ]
branches:
- master
- maint-3.0
paths:
# first, yes to these
- '.github/workflows/e3sm-gh-ci-cime-tests.yml'
Expand All @@ -22,10 +24,14 @@ on:

workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:

ci:
if: ${{ github.event.repository.name == 'e3sm' }}
if: ${{ github.repository == 'E3SM-Project/E3SM' }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand All @@ -36,7 +42,7 @@ jobs:
- SMS_D_Ln5_P4.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.ghci-oci_gnu
- ERS_Ld5_P4.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.ghci-oci_gnu.eamxx-prod
container:
image: ghcr.io/e3sm-project/containers-ghci:ghci-0.1.0
image: ghcr.io/e3sm-project/containers-ghci:ghci-0.2.0

steps:
-
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/e3sm-gh-ci-w-cime-tests.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
name: gh
name: gh-w

on:
pull_request:
branches: [ master ]
branches:
- master
- maint-3.0
paths-ignore:
- 'mkdocs.yaml'
- 'docs/**'
Expand All @@ -11,10 +13,14 @@ on:

workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:

ci-w:
if: ${{ github.event.repository.name == 'e3sm' }}
ci:
if: ${{ github.repository == 'E3SM-Project/E3SM' }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand All @@ -23,7 +29,7 @@ jobs:
- SMS_D_Ld1_P8.ne4pg2_oQU480.WCYCL2010NS.ghci-oci_gnu
- ERS_Ld3_P8.ne4pg2_oQU480.WCYCL2010NS.ghci-oci_gnu.allactive-wcprod_1850
container:
image: ghcr.io/e3sm-project/containers-ghci:ghci-0.1.0
image: ghcr.io/e3sm-project/containers-ghci:ghci-0.2.0

steps:
-
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/e3sm-gh-md-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ on:
# for now let's not lint files in eamxx
- '!components/eamxx/**/*.md'

concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:
linter:
if: ${{ github.repository == 'E3SM-Project/E3SM' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e3sm-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ concurrency:

jobs:
Build-and-Deploy-docs:
if: ${{ github.event.repository.name == 'e3sm' }}
if: ${{ github.repository == 'E3SM-Project/E3SM' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/e3sm-gh-tools-mkatmsrffile-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ on:
- cron: '00 15 * * 2'
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:
mkatmsrffile-test:
if: ${{ github.repository == 'E3SM-Project/E3SM' }}
runs-on: ubuntu-latest
defaults:
run:
Expand All @@ -31,18 +36,15 @@ jobs:
uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: "envmkatmsrffile"
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true
mamba-version: "*"
channel-priority: strict
auto-update-conda: true
python-version: 3.11
-
name: Install dependencies
run: |
echo $CONDA_PREFIX
mamba install -y nco xarray numba numpy netcdf4
conda install -y nco xarray numba numpy netcdf4 -c conda-forge
-
name: Run tests
working-directory: components/eam/tools/mkatmsrffile
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/eamxx-gh-ci-standalone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,14 @@ on:

workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:

ci:
if: ${{ github.repository == 'E3SM-Project/E3SM' }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/eamxx-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ concurrency:
jobs:

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

steps:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/eamxx_default_files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@ on:
- cron: '00 00 * * *'
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:
scream-defaults:
if: ${{ github.event.repository.name == 'e3sm' }}
if: ${{ github.repository == 'E3SM-Project/E3SM' }}
runs-on: ubuntu-latest
outputs:
event_name: ${{ github.event_name }}
Expand Down

0 comments on commit 019bc13

Please sign in to comment.