Finish arm64 testing in nightly and release (#153)

f3d-app · Mar 4, 2024 · 553b464 · 553b464
1 parent f1f2d58
commit 553b464
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 8 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -138,9 +138,6 @@ jobs:
       matrix:
         raytracing_label: [raytracing, no-raytracing]
         cpu: [x86_64]
-        include:
-          - cpu: arm64
-            raytracing_label: no-raytracing
 
     runs-on: macos-latest
 
@@ -185,6 +182,56 @@ jobs:
         body: "Automatically generated nightly binary release"
         artifacts: './build/F3D-*'
 
+  macos_arm:
+    needs: check_nightly
+    if: ${{ needs.check_nightly.outputs.should_run == 'true' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        cpu: [arm64]
+
+    runs-on: macos-14
+
+    env:
+      CMAKE_OSX_ARCHITECTURES: ${{matrix.cpu}}
+
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        path: 'source'
+        submodules: true
+        lfs: true
+
+    - name: Build and package F3D
+      uses: ./source/.github/actions/f3d-superbuild/
+      with:
+        f3d_version: ${{ needs.check_nightly.outputs.f3d_sha}}
+
+    - name: Delete previous nightly release assets
+      uses: mknejp/delete-release-assets@v1
+      with:
+        token: ${{ secrets.SECRET_TOKEN }}
+        repository: f3d-app/f3d
+        tag: nightly
+        assets: "F3D-*-macOS-${{ matrix.cpu}}.*"
+        fail-if-no-assets: false
+
+    - name: Publish nightly release
+      uses: ncipollo/release-action@v1
+      with:
+        owner: f3d-app
+        repo: f3d
+        token: ${{ secrets.SECRET_TOKEN }}
+        prerelease: true
+        allowUpdates: true
+        updateOnlyUnreleased: true
+        tag: nightly
+        name: "Nightly"
+        body: "Automatically generated nightly binary release"
+        artifacts: './build/F3D-*'
+
   python_wheels:
     needs: check_nightly
     if: ${{ needs.check_nightly.outputs.should_run == 'true' }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -108,15 +108,11 @@ jobs:
       fail-fast: false
       matrix:
         raytracing_label: [raytracing, no-raytracing]
-        cpu: [x86_64]
-        include:
-          - cpu: arm64
-            raytracing_label: no-raytracing
 
     runs-on: macos-latest
 
     env:
-      CMAKE_OSX_ARCHITECTURES: ${{matrix.cpu}}
+      CMAKE_OSX_ARCHITECTURES: x86_64
 
     steps:
 
@@ -150,6 +146,46 @@ jobs:
         tag: ${{github.event.inputs.f3d_version}}
         artifacts: './build/F3D-*'
 
+  macos_arm:
+    strategy:
+      fail-fast: false
+
+    runs-on: macos-14
+
+    env:
+      CMAKE_OSX_ARCHITECTURES: arm64
+
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        path: 'source'
+        submodules: true
+        lfs: true
+        ref: ${{ github.event.inputs.sb_branch}}
+
+    - name: Build and package F3D
+      uses: ./source/.github/actions/f3d-superbuild/
+      with:
+        f3d_version: ${{github.event.inputs.f3d_version}}
+
+    - name: Publish assets
+      if: ${{ github.event.inputs.publish_assets == 'true' }}
+      uses: ncipollo/release-action@v1
+      with:
+        owner: f3d-app
+        repo: f3d
+        token: ${{ secrets.SECRET_TOKEN }}
+        prerelease: true
+        allowUpdates: true
+        updateOnlyUnreleased: true
+        replacesArtifacts: true
+        omitBodyDuringUpdate: true
+        omitNameDuringUpdate: true
+        tag: ${{github.event.inputs.f3d_version}}
+        artifacts: './build/F3D-*'
+
   python_wheels:
     strategy:
       fail-fast: false