Skip to content

Commit 3b9abd5

Browse files
committed
Merge tag 'ctsm5.3.067' into subsetdata-systemtest
(Mostly) fix interim restarts
2 parents d8bf1b8 + 9451d2f commit 3b9abd5

File tree

71 files changed

+3566
-1539
lines changed

Some content is hidden

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

71 files changed

+3566
-1539
lines changed

.github/workflows/check-clm6-aliases.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2929

3030
- name: Checkout submodules
3131
run: |

.github/workflows/docker-image-build-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
steps:
4444
- name: Checkout repository
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4646

4747
# Uses the `docker/login-action` action to log in to the Container registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
4848
- name: Log in to the Container registry
@@ -78,7 +78,7 @@ jobs:
7878

7979
# This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see [Using artifact attestations to establish provenance for builds](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds).
8080
- name: Generate artifact attestation
81-
uses: actions/attest-build-provenance@v2
81+
uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be # v2
8282
with:
8383
subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
8484
subject-digest: ${{ steps.push.outputs.digest }}

.github/workflows/docker-image-common.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,11 @@ jobs:
3030
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
3131
permissions:
3232
contents: read
33-
packages: write
34-
attestations: write
35-
id-token: write
3633

3734
steps:
3835

3936
- name: Checkout repository
40-
uses: actions/checkout@v4
37+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4138

4239
# Ensure that the repository part of IMAGE_NAME is lowercase. This is needed because Docker requires image names to be entirely lowercase. Note that the *image name* part, set as IMAGE_BASENAME in the env block above, is *not* converted. This will cause the check-version job to fail if the IMAGE_BASENAME contains capitals. We don't want to silently fix that here; rather, we require the user to specify a lowercase IMAGE_BASENAME.
4340
- name: Get image name with lowercase repo

.github/workflows/docker-image-get-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
steps:
4444
- name: Check out repository
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4646

4747
- name: Get version number from Dockerfile and check it
4848
id: get-check-version

.github/workflows/docs-build-and-deploy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ jobs:
4040
runs-on: ubuntu-latest
4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@v4
43+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4444
with:
4545
# Get all history, ensuring all branches are available for checkout
4646
fetch-depth: 0
4747

4848
- name: Setup Pages
49-
uses: actions/configure-pages@v5
49+
uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5
5050

5151
# Check out all submodules because we might :literalinclude: something from one
5252
- name: Checkout all submodules
@@ -60,11 +60,11 @@ jobs:
6060
./build_docs_to_publish -d --site-root https://escomp.github.io/CTSM
6161
6262
- name: Upload artifact
63-
uses: actions/upload-pages-artifact@v3
63+
uses: actions/upload-pages-artifact@0252fc4ba7626f0298f0cf00902a25c6afc77fa8 # v3
6464
with:
6565
# Upload publish dir
6666
path: 'doc/_publish'
6767

6868
- name: Deploy to GitHub Pages
6969
id: deployment
70-
uses: actions/deploy-pages@v4
70+
uses: actions/deploy-pages@f33f41b675f0ab2dc5a6863c9a170fe83af3571e # v4

.github/workflows/docs-common.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
build-docs:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2525
with:
2626
fetch-depth: 0
2727
lfs: true
@@ -35,12 +35,12 @@ jobs:
3535
# Based on https://github.com/actions/cache/blob/main/examples.md#python---pip
3636
- name: Install python
3737
if: ${{ ! inputs.use_conda }}
38-
uses: actions/setup-python@v2
38+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
3939
with:
4040
python-version: '3.13.2' # needs to be coordinated with version in python/conda_env_ctsm_py.txt
4141
- name: Cache pip
4242
if: ${{ ! inputs.use_conda }}
43-
uses: actions/cache@v3
43+
uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # v3
4444
with:
4545
path: ~/.cache/pip
4646
key: ${{ runner.os }}-pip-${{ hashFiles('doc/ctsm-docs_container/requirements.txt') }}
@@ -54,7 +54,7 @@ jobs:
5454
# Do this if using conda
5555
- name: Set up conda environment
5656
if: ${{ inputs.use_conda }}
57-
uses: conda-incubator/setup-miniconda@v3
57+
uses: conda-incubator/setup-miniconda@2defc80cc6f4028b1780c50faf08dd505d698976 # v3
5858
with:
5959
activate-environment: ${{ inputs.conda_env_name }}
6060
environment-file: ${{ inputs.conda_env_file }}

.github/workflows/docs-omnibus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2828
with:
2929
fetch-depth: 0
3030
lfs: true
@@ -36,7 +36,7 @@ jobs:
3636
3737
# Set up conda
3838
- name: Set up conda environment
39-
uses: conda-incubator/setup-miniconda@v3
39+
uses: conda-incubator/setup-miniconda@2defc80cc6f4028b1780c50faf08dd505d698976 # v3
4040
with:
4141
activate-environment: ctsm_pylib
4242
environment-file: python/conda_env_ctsm_py.yml

.github/workflows/docs-update-ctsm_pylib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
needs: test-build-docs-ctsm_pylib
5454
runs-on: ubuntu-latest
5555
steps:
56-
- uses: actions/checkout@v3
56+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5757

5858
- name: Create issue
5959
uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5

.github/workflows/docs-update-dependency-common.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3131
with:
3232
fetch-depth: 0
3333
lfs: true
@@ -38,7 +38,7 @@ jobs:
3838
bin/git-fleximod update -o
3939
4040
- name: Set up conda environment
41-
uses: conda-incubator/setup-miniconda@v3
41+
uses: conda-incubator/setup-miniconda@2defc80cc6f4028b1780c50faf08dd505d698976 # v3
4242
with:
4343
activate-environment: ${{ inputs.conda_env_name }}
4444
environment-file: ${{ inputs.conda_env_file }}
@@ -53,7 +53,7 @@ jobs:
5353
makefile-method:
5454
runs-on: ubuntu-latest
5555
steps:
56-
- uses: actions/checkout@v4
56+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5757
with:
5858
fetch-depth: 0
5959
lfs: true
@@ -64,7 +64,7 @@ jobs:
6464
bin/git-fleximod update -o
6565
6666
- name: Set up conda environment
67-
uses: conda-incubator/setup-miniconda@v3
67+
uses: conda-incubator/setup-miniconda@2defc80cc6f4028b1780c50faf08dd505d698976 # v3
6868
with:
6969
activate-environment: ${{ inputs.conda_env_name }}
7070
environment-file: ${{ inputs.conda_env_file }}

.github/workflows/docs-update-doc-builder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
runs-on: ubuntu-latest
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3232
with:
3333
fetch-depth: 0
3434
lfs: true

0 commit comments

Comments
 (0)