From f1f2d585b110189f856bdbcd68b034094115fab7 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 20 Feb 2024 05:33:17 +0800 Subject: [PATCH] arm64 native build (#151) * arm64 native build * only some tests --- .github/actions/f3d-superbuild/action.yml | 11 +++++++++ .github/workflows/ci.yml | 30 ++++++++++++++++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/.github/actions/f3d-superbuild/action.yml b/.github/actions/f3d-superbuild/action.yml index 4c2b294d..8695bbb7 100644 --- a/.github/actions/f3d-superbuild/action.yml +++ b/.github/actions/f3d-superbuild/action.yml @@ -178,6 +178,17 @@ runs: ctest -R f3d-exec-TestOCCT$ -VV ctest -R f3d-exec-TestUSD$ -VV + # on macOS arm64, grid rendering has some issues, + # test only some tests that do not uses grid. + # https://github.com/f3d-app/f3d/issues/1276 + - name: Test package EGL + if: env.CMAKE_OSX_ARCHITECTURES == 'arm64' + working-directory: ${{github.workspace}}/build + shell: bash + run: | + ctest -R f3d-exec-exists$ -VV + ctest -R f3d-exec-TestThumbnail$ -VV + - name: Upload Tests Artifact if: failure() uses: actions/upload-artifact@v4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 032ddb3b..5bceac42 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,9 +69,6 @@ jobs: matrix: raytracing_label: [raytracing, no-raytracing] cpu: [x86_64] - include: - - cpu: arm64 - raytracing_label: no-raytracing runs-on: macos-latest @@ -93,6 +90,33 @@ jobs: f3d_version: origin/master raytracing_label: ${{matrix.raytracing_label}} + macos_arm: + strategy: + fail-fast: false + matrix: + raytracing_label: [no-raytracing] + 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: origin/master + raytracing_label: ${{matrix.raytracing_label}} + python_wheels: strategy: fail-fast: false