From affc04fe17570cec4e5e0cd590b37b5154953889 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 3 Jul 2023 19:41:29 -0400 Subject: [PATCH 1/3] Update components.yaml to match GEOSgcm --- .github/workflows/enforce-labels.yml | 7 +++---- .github/workflows/push-to-develop.yml | 4 ++-- .github/workflows/release-tarball.yml | 4 ++-- components.yaml | 8 ++++---- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml index 3e27600d..86f4bb4e 100644 --- a/.github/workflows/enforce-labels.yml +++ b/.github/workflows/enforce-labels.yml @@ -8,20 +8,20 @@ jobs: require-label: runs-on: ubuntu-latest steps: - - uses: mheap/github-action-required-labels@v3 + - uses: mheap/github-action-required-labels@v5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: mode: minimum count: 1 - labels: "0 diff,0 diff trivial,Non 0-diff,0 diff structural,0-diff trivial,Not 0-diff,0-diff,automatic,0-diff uncoupled" + labels: "0 diff,0 diff trivial,Non 0-diff,0 diff structural,0-diff trivial,Not 0-diff,0-diff,automatic,0-diff uncoupled,github_actions" add_comment: true message: "This PR is being prevented from merging because you have not added one of our required labels: {{ provided }}. Please add one so that the PR can be merged." blocking-label: runs-on: ubuntu-latest steps: - - uses: mheap/github-action-required-labels@v3 + - uses: mheap/github-action-required-labels@v5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -30,4 +30,3 @@ jobs: labels: "Contingent - DNA,Needs Lead Approval,Contingent -- Do Not Approve" add_comment: true message: "This PR is being prevented from merging because you have added one of our blocking labels: {{ provided }}. You'll need to remove it before this PR can be merged." - diff --git a/.github/workflows/push-to-develop.yml b/.github/workflows/push-to-develop.yml index 59424134..fd525b2a 100644 --- a/.github/workflows/push-to-develop.yml +++ b/.github/workflows/push-to-develop.yml @@ -11,11 +11,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v3.3.0 with: fetch-depth: 0 - name: Run the action - uses: devops-infra/action-pull-request@v0.4 + uses: devops-infra/action-pull-request@v0.5.5 with: github_token: ${{ secrets.GITHUB_TOKEN }} source_branch: develop diff --git a/.github/workflows/release-tarball.yml b/.github/workflows/release-tarball.yml index 467370db..41f28389 100644 --- a/.github/workflows/release-tarball.yml +++ b/.github/workflows/release-tarball.yml @@ -10,12 +10,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3.3.0 with: path: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }} - name: Checkout mepo - uses: actions/checkout@v2 + uses: actions/checkout@v3.3.0 with: repository: GEOS-ESM/mepo path: mepo diff --git a/components.yaml b/components.yaml index b3d29462..23b91951 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSldas: env: local: ./@env remote: ../ESMA_env.git - tag: v4.16.0 + tag: v4.17.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v3.28.0 + tag: v3.30.0 develop: develop ecbuild: @@ -22,7 +22,7 @@ ecbuild: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: v1.9.0 + tag: v1.9.1 sparse: ./config/GMAO_Shared.sparse develop: main @@ -35,7 +35,7 @@ GEOS_Util: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.39.1 + tag: v2.39.4 develop: develop GEOSgcm_GridComp: From b7b148bb7e9f104444934bd90f5891349eb9bce5 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 3 Jul 2023 19:47:58 -0400 Subject: [PATCH 2/3] Update Baselibs in CI --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 096c8ed0..f886bcce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 # Anchor to prevent forgetting to update a version -baselibs_version: &baselibs_version v7.7.0 +baselibs_version: &baselibs_version v7.13.0 orbs: ci: geos-esm/circleci-tools@1 From ff413f11a317505f16217026401db5ba6cdc6345 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 4 Jul 2023 13:32:27 -0400 Subject: [PATCH 3/3] Update to GEOS_Util v2.0.2 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 23b91951..5ca4fecb 100644 --- a/components.yaml +++ b/components.yaml @@ -29,7 +29,7 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: v2.0.1 + tag: v2.0.2 develop: main MAPL: