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

Enable gh/ci on maint-3.0 #6707

Merged
merged 5 commits into from
Oct 27, 2024
Merged

Enable gh/ci on maint-3.0 #6707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7182613
upgrades and fixes to workflows
mahf708 Oct 15, 2024
c79b9e4
updates to miniforge settings
mahf708 Oct 15, 2024
2dc3601
add concurrency check for standalone
mahf708 Oct 15, 2024
aef19a4
rename gh/ci-w to gh-w/ci
mahf708 Oct 15, 2024
99165ed
activate gh/ci on maint-3.0
mahf708 Oct 24, 2024
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
12 changes: 9 additions & 3 deletions .github/workflows/e3sm-gh-ci-cime-tests.yml
View file
Open in desktop
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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bartgol you already reviewed all of this in #6686, so pointing out the only change here: adding the line maint-3.0 so that PRs to that maint branch are tested

Copy link
Contributor

@bartgol bartgol Oct 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good. Quick clarification: do we usually update maint branches via PRs or manually merging fixes and pushing directly to maint? If the former, all good. Otherwise we may want to change the trigger for maint to a push.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we intend to only allow PRs in general, but @rljacob can confirm

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes PRs and the PR issuer has to make sure to change the target to a maint branch.

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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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