CI: Fix block cache update (ansys#7162)

Co-authored-by: pyansys-ci-bot <[email protected]>
Co-authored-by: Samuel Lopez <[email protected]>

Author: 3 people

.github/workflows/update-testmondata-cache.yml

@@ -1,9 +1,7 @@
 name: Update Testmon Cache on Merge
 
 on:
-  pull_request:
-    types:
-      - closed
+  push:
     branches:
       - main
   workflow_dispatch:
@@ -38,12 +36,25 @@ env:
   TESTMON_CACHE_KEY_EMIT_WIN: 'testmondata-emit-win'
 
 jobs:
+  # ------------------------------------------------------------------
+  # WORKFLOW DISPATCH GUARD
+  # ------------------------------------------------------------------
+  check-reference:
+    name: Check reference is main
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check reference is main
+        if: ${{ github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/main' }}
+        run: |
+          echo "This workflow can only run on main"
+          exit 1
+
   # ------------------------------------------------------------------
   # UNIT TESTS CACHE UPDATE (LINUX)
   # ------------------------------------------------------------------
   update-unit-linux:
     name: Update unit test cache (Linux)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: ubuntu-latest
     permissions:
       actions: write # Needed to delete cache
@@ -119,7 +130,7 @@ jobs:
   # ------------------------------------------------------------------
   update-integration-linux:
     name: Update integration test cache (Linux)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: ubuntu-latest
     permissions:
       actions: write # Needed to delete cache
@@ -191,7 +202,7 @@ jobs:
   # ------------------------------------------------------------------
   update-solvers-win:
     name: Update solvers test cache (Windows)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: [ self-hosted, Windows, pyaedt ]
     permissions:
       actions: write # Needed to delete cache
@@ -277,7 +288,7 @@ jobs:
   # ------------------------------------------------------------------
   update-solvers-linux:
     name: Update solvers test cache (Linux)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: [ self-hosted, Linux, pyaedt ]
     permissions:
       actions: write # Needed to delete cache
@@ -362,7 +373,7 @@ jobs:
   # ------------------------------------------------------------------
   update-general-win:
     name: Update general test cache (Windows)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: [ self-hosted, Windows, pyaedt ]
     permissions:
       actions: write # Needed to delete cache
@@ -451,7 +462,7 @@ jobs:
   # ------------------------------------------------------------------
   update-general-linux:
     name: Update general test cache (Linux)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: [ self-hosted, Linux, pyaedt ]
     permissions:
       actions: write # Needed to delete cache
@@ -538,7 +549,7 @@ jobs:
   # ------------------------------------------------------------------
   update-visualization-win:
     name: Update visualization test cache (Windows)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: [ self-hosted, Windows, pyaedt ]
     permissions:
       actions: write # Needed to delete cache
@@ -628,7 +639,7 @@ jobs:
   # ------------------------------------------------------------------
   update-visualization-linux:
     name: Update visualization test cache (Linux)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: [ self-hosted, Linux, pyaedt ]
     permissions:
       actions: write # Needed to delete cache
@@ -716,7 +727,7 @@ jobs:
   # ------------------------------------------------------------------
   update-icepak-win:
     name: Update icepak test cache (Windows)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: [ self-hosted, Windows, pyaedt ]
     permissions:
       actions: write # Needed to delete cache
@@ -802,7 +813,7 @@ jobs:
   # ------------------------------------------------------------------
   update-icepak-linux:
     name: Update icepak test cache (Linux)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: [ self-hosted, Linux, pyaedt ]
     permissions:
       actions: write # Needed to delete cache
@@ -887,7 +898,7 @@ jobs:
   # ------------------------------------------------------------------
   update-layout-win:
     name: Update layout test cache (Windows)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: [ self-hosted, Windows, pyaedt ]
     permissions:
       actions: write # Needed to delete cache
@@ -972,7 +983,7 @@ jobs:
   # ------------------------------------------------------------------
   update-layout-linux:
     name: Update layout test cache (Linux)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: [ self-hosted, Linux, pyaedt ]
     permissions:
       actions: write # Needed to delete cache
@@ -1057,7 +1068,7 @@ jobs:
   # ------------------------------------------------------------------
   update-extensions-win:
     name: Update extensions test cache (Windows)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: [ self-hosted, Windows, pyaedt ]
     permissions:
       actions: write # Needed to delete cache
@@ -1146,7 +1157,7 @@ jobs:
   # ------------------------------------------------------------------
   update-extensions-linux:
     name: Update extensions test cache (Linux)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: [ self-hosted, Linux, pyaedt ]
     permissions:
       actions: write # Needed to delete cache
@@ -1233,7 +1244,7 @@ jobs:
   # ------------------------------------------------------------------
   update-filter-win:
     name: Update filter test cache (Windows)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: [ self-hosted, Windows, pyaedt ]
     permissions:
       actions: write # Needed to delete cache
@@ -1319,7 +1330,7 @@ jobs:
   # ------------------------------------------------------------------
   update-emit-win:
     name: Update emit test cache (Windows)
-    if: ${{ (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || github.event.pull_request.merged == true }}
+    needs: check-reference
     runs-on: [ self-hosted, Windows, pyaedt ]
     permissions:
       actions: write # Needed to delete cache

doc/changelog.d/7162.maintenance.md

@@ -0,0 +1 @@
+Fix block cache update