From 5a57c838423a7db8a805798696f5ca303f7da069 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 23 Apr 2025 11:16:36 -0400 Subject: [PATCH 1/2] Fix github actions --- .github/workflows/spack-ci.yml | 3 +-- .github/workflows/workflow.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/spack-ci.yml b/.github/workflows/spack-ci.yml index 760ca18e1..b50b9b5cd 100644 --- a/.github/workflows/spack-ci.yml +++ b/.github/workflows/spack-ci.yml @@ -57,8 +57,7 @@ jobs: mepo status - name: Update other branches - if: - "!contains('refs/heads/main,refs/heads/develop', github.ref)" + if: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }} run: | mepo checkout-if-exists ${GITHUB_HEAD_REF} mepo status diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 71302eac4..d746e03a4 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -67,8 +67,7 @@ jobs: mepo status - name: Update other branches - if: - "!contains('refs/heads/main,refs/heads/develop', github.ref)" + if: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }} run: | mepo checkout-if-exists ${GITHUB_HEAD_REF} mepo status From af950cbf54bb98d4b68f277e3fee679e0a4a03c4 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 23 Apr 2025 11:24:48 -0400 Subject: [PATCH 2/2] Try a different fix --- .github/workflows/spack-ci.yml | 5 ++++- .github/workflows/workflow.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/spack-ci.yml b/.github/workflows/spack-ci.yml index b50b9b5cd..f6ff94c20 100644 --- a/.github/workflows/spack-ci.yml +++ b/.github/workflows/spack-ci.yml @@ -56,8 +56,11 @@ jobs: mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util mepo status + - name: Debug PR branch + run: echo "PR is coming from ${{ github.event.pull_request.head.ref }}" + - name: Update other branches - if: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }} + if: ${{ github.event.pull_request.head.ref != 'main' && github.event.pull_request.head.ref != 'develop' }} run: | mepo checkout-if-exists ${GITHUB_HEAD_REF} mepo status diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index d746e03a4..2c8dd1f6d 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -66,8 +66,11 @@ jobs: mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util mepo status + - name: Debug PR branch + run: echo "PR is coming from ${{ github.event.pull_request.head.ref }}" + - name: Update other branches - if: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }} + if: ${{ github.event.pull_request.head.ref != 'main' && github.event.pull_request.head.ref != 'develop' }} run: | mepo checkout-if-exists ${GITHUB_HEAD_REF} mepo status