ci: accommodate master/develop branch split (#109)

MODFLOW-USGS · Aug 8, 2023 · 4afd7f1 · 4afd7f1
1 parent 3d54a42
commit 4afd7f1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/ex-rtd.yml b/.github/workflows/ex-rtd.yml
@@ -4,12 +4,16 @@ on:
   schedule:
     - cron: '0 2 * * *' # run at 2 AM UTC
   push:
-    branches: [ master, develop ]
+    branches:
+      - master
+      - develop
     paths-ignore:
       - 'README.md'
       - 'DEVELOPER.md'
   pull_request:
-    branches: [ master, develop ]
+    branches:
+      - master
+      - develop
 
 jobs:
   rtd_build:
@@ -116,7 +120,7 @@ jobs:
     needs: rtd_build
     runs-on: ubuntu-latest
 
-    if: github.repository_owner == 'MODFLOW-USGS' && github.event_name == 'push'
+    if: github.repository_owner == 'MODFLOW-USGS' && github.event_name == 'push' && github.ref_name == 'master'
     steps:
       - name: Checkout MODFLOW6 examples repo
         uses: actions/checkout@v3

diff --git a/.github/workflows/ex-workflow.yml b/.github/workflows/ex-workflow.yml
@@ -4,12 +4,16 @@ on:
   schedule:
     - cron: '0 2 * * *' # run at 2 AM UTC
   push:
-    branches: [ master, develop ]
+    branches: 
+      - master
+      - develop
     paths-ignore:
       - 'README.md'
       - 'DEVELOPER.md'
   pull_request:
-    branches: [ master, develop ]
+    branches:
+      - master
+      - develop
     paths-ignore:
       - 'README.md'
       - 'DEVELOPER.md'
@@ -241,13 +245,13 @@ jobs:
           ls -l .
 
       - name: Delete the latest release
-        if: github.repository_owner == 'MODFLOW-USGS' && github.event_name == 'push'
+        if: github.repository_owner == 'MODFLOW-USGS' && github.event_name == 'push' && github.ref_name == 'master'
         uses: ame-yu/action-delete-latest-release@v2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create/Update the current release
-        if: github.repository_owner == 'MODFLOW-USGS' && github.event_name == 'push'
+        if: github.repository_owner == 'MODFLOW-USGS' && github.event_name == 'push' && github.ref_name == 'master'
         uses: ncipollo/release-action@v1
         with:
           tag: current
@@ -258,7 +262,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload MODFLOW 6 examples to the current GitHub release
-        if: github.repository_owner == 'MODFLOW-USGS' && github.event_name == 'push'
+        if: github.repository_owner == 'MODFLOW-USGS' && github.event_name == 'push' && github.ref_name == 'master'
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -268,7 +272,7 @@ jobs:
           file_glob: true
 
       - name: Delete all Artifacts
-        if: github.repository_owner == 'MODFLOW-USGS' && github.event_name == 'push'
+        if: github.repository_owner == 'MODFLOW-USGS' && github.event_name == 'push' && github.ref_name == 'master'
         uses: GeekyEggo/delete-artifact@v2
         with:
           name: |