Improve nightly CI (#1282)

* macOS arm64 nightly VTK build * run nightly only on f3d-app/f3d * Further fixups * try again * final fixup
f3d-app · Feb 12, 2024 · 81f383f · 81f383f
1 parent b87ba39
commit 81f383f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -140,17 +140,14 @@ jobs:
   macos:
     if: github.event.pull_request.draft == false
     needs: cache_lfs
-
     strategy:
       fail-fast: false
       matrix:
         vtk_version: [commit, v9.3.0, v9.2.6]
-        cpu: [x86_64]
         bundle_label: [no-bundle]
         include:
           - vtk_version: commit
             bundle_label: bundle
-            cpu: x86_64
 
     runs-on: macos-latest
 
@@ -167,7 +164,7 @@ jobs:
       with:
         vtk_version: ${{matrix.vtk_version}}
         bundle_label: ${{matrix.bundle_label}}
-        cpu: ${{matrix.cpu}}
+        cpu: x86_64
         lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}
 
 #----------------------------------------------------------------------------
@@ -181,12 +178,10 @@ jobs:
       fail-fast: false
       matrix:
         vtk_version: [commit, v9.3.0, v9.2.6]
-        cpu: [arm64]
         bundle_label: [no-bundle]
         include:
           - vtk_version: commit
             bundle_label: bundle
-            cpu: arm64
 
     runs-on: macos-14
 
@@ -203,7 +198,7 @@ jobs:
       with:
         vtk_version: ${{matrix.vtk_version}}
         bundle_label: ${{matrix.bundle_label}}
-        cpu: ${{matrix.cpu}}
+        cpu: arm64
         lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}
 
 #----------------------------------------------------------------------------

diff --git a/.github/workflows/nightly_vtk_master.yml b/.github/workflows/nightly_vtk_master.yml
@@ -10,6 +10,7 @@ jobs:
 # Check nightly: Checkout VTK and check if the last merged commit is less than 24 hours old
 #----------------------------------------------------------------------------
   check_nightly:
+    if: github.repository == 'f3d-app/f3d'
     runs-on: ubuntu-latest
     name: Check nightly
     outputs:
@@ -132,15 +133,13 @@ jobs:
         lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}
 
 #----------------------------------------------------------------------------
-# MacOS CI: Build and test, cross-cpu build matrix
+# MacOS CI: Build and test
 #----------------------------------------------------------------------------
   macos:
     needs: [cache_lfs, check_nightly]
     if: ${{ needs.check_nightly.outputs.should_run == 'true' }}
     strategy:
       fail-fast: false
-      matrix:
-        cpu: [x86_64, arm64]
 
     runs-on: macos-latest
 
@@ -155,9 +154,34 @@ jobs:
     - name: Generic CI
       uses: ./source/.github/actions/generic-ci
       with:
-        build_type: ${{matrix.build_type}}
         vtk_version: ${{needs.check_nightly.outputs.vtk_sha}}
-        cpu: ${{matrix.cpu}}
+        cpu: x86_64
+        lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}
+
+#----------------------------------------------------------------------------
+# MacOS arm64 CI: Build and test
+#----------------------------------------------------------------------------
+  macos_arm:
+    needs: [cache_lfs, check_nightly]
+    if: ${{ needs.check_nightly.outputs.should_run == 'true' }}
+    strategy:
+      fail-fast: false
+
+    runs-on: macos-14
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        path: 'source'
+        fetch-depth: 0
+        lfs: false
+
+    - name: Generic CI
+      uses: ./source/.github/actions/generic-ci
+      with:
+        vtk_version: ${{needs.check_nightly.outputs.vtk_sha}}
+        cpu: arm64
         lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}
 
 #----------------------------------------------------------------------------