diff --git a/.github/workflows/build-ocp.yml b/.github/workflows/build-ocp.yml index 5829b67..a6c5a33 100644 --- a/.github/workflows/build-ocp.yml +++ b/.github/workflows/build-ocp.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["macos-13", "macos-14", "ubuntu-20.04", "windows-2019"] + os: ["macos-13", "macos-14", "macos-15-arm64", "ubuntu-20.04", "ubuntu-22.04-arm", "windows-2019"] python-version: ["3.10", "3.11", "3.12", "3.13"] use-vtk: ["vtk", "novtk"] @@ -43,6 +43,13 @@ jobs: sed_i: "gsed -i" env: "MACOSX_DEPLOYMENT_TARGET=11.1" shells: "bash" + - os: "macos-15-arm64" + vtk_libs: ".dylibs/libvtk*.dylib" + vtk_suffix: "/" + vtk_prefix: "" + sed_i: "gsed -i" + env: "MACOSX_DEPLOYMENT_TARGET=11.1" + shells: "bash" - os: "ubuntu-20.04" vtk_libs: "libvtk*.so" vtk_suffix: "/vtk-9.3/" @@ -134,6 +141,10 @@ jobs: echo "Downloading cadquery_vtk-${{ env.VTK }}-cp313-cp313-macosx_11_0_arm64.whl" curl -L -O ${{ env.VTK313_URL }}/cadquery_vtk-${{ env.VTK }}-cp313-cp313-macosx_11_0_arm64.whl + elif [[ "${{ matrix.os }}" == "macos-15-arm64" ]]; then + echo "Downloading cadquery_vtk-${{ env.VTK }}-cp313-cp313-macosx_11_0_arm64.whl" + curl -L -O ${{ env.VTK313_URL }}/cadquery_vtk-${{ env.VTK }}-cp313-cp313-macosx_11_0_arm64.whl + elif [[ "${{ matrix.os }}" == "macos-13" ]]; then echo "Downloading cadquery_vtk-9.3.1-cp313-cp313-macosx_11_0_x86_64.whl" curl -L -O ${{ env.VTK313_URL }}/cadquery_vtk-9.3.1-cp313-cp313-macosx_11_0_x86_64.whl @@ -447,7 +458,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["macos-13", "macos-14", "ubuntu-20.04", "windows-2019"] + os: ["macos-13", "macos-14", "macos-15-arm64", "ubuntu-20.04", "windows-2019"] python-version: ["3.11"] include: @@ -459,6 +470,10 @@ jobs: sed_i: "gsed -i" env: "MACOSX_DEPLOYMENT_TARGET=11.1" shells: "bash" + - os: "macos-15-arm64" + sed_i: "gsed -i" + env: "MACOSX_DEPLOYMENT_TARGET=11.1" + shells: "bash" - os: "ubuntu-20.04" sed_i: "sed -i" env: "DUMMY=0" @@ -638,7 +653,7 @@ jobs: rm -fr OCP # remove the cached sources again - if [[ ${{ matrix.os }} == "macos-13" || ${{ matrix.os }} == "macos-14" ]]; then + if [[ ${{ matrix.os }} == "macos-13" || ${{ matrix.os }} == "macos-14" || ${{ matrix.os }} == "macos-15-arm64" ]]; then curl -L -O https://github.com/CadQuery/OCP/releases/download/${{ env.OCP }}/OCP_src_stubs_macOS-latest.zip else curl -L -O https://github.com/CadQuery/OCP/releases/download/${{ env.OCP }}/OCP_src_stubs_${{ matrix.os }}.zip @@ -674,7 +689,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["macos-13", "macos-14", "ubuntu-20.04", "windows-2019"] + os: ["macos-13", "macos-14", "macos-15-arm64", "ubuntu-20.04", "windows-2019"] python-version: ["3.10", "3.11", "3.12", "3.13"] use-vtk: ["vtk", "novtk"] @@ -693,6 +708,13 @@ jobs: module: "OCP.*.so" env: "MACOSX_DEPLOYMENT_TARGET=11.1" shells: "bash" + - os: "macos-15-arm64" + delocate: delocate + plat: macosx_11_1_arm64 + sed_i: "gsed -i" + module: "OCP.*.so" + env: "MACOSX_DEPLOYMENT_TARGET=11.1" + shells: "bash" - os: "ubuntu-20.04" delocate: auditwheel patchelf plat: manylinux_2_31_x86_64 @@ -1175,7 +1197,11 @@ jobs: if: matrix.python-version == '3.13' && matrix.use-vtk == 'vtk' shell: bash -l {0} run: | - if [[ "${{ matrix.os }}" == "macos-14" ]]; then + if [[ "${{ matrix.os }}" == "macos-15-arm64" ]]; then + echo "Downloading cadquery_vtk-${{ env.VTK }}-cp313-cp313-macosx_11_0_arm64.whl" + curl -L -O ${{ env.VTK313_URL }}/cadquery_vtk-${{ env.VTK }}-cp313-cp313-macosx_11_0_arm64.whl + + elif [[ "${{ matrix.os }}" == "macos-14" ]]; then echo "Downloading cadquery_vtk-${{ env.VTK }}-cp313-cp313-macosx_11_0_arm64.whl" curl -L -O ${{ env.VTK313_URL }}/cadquery_vtk-${{ env.VTK }}-cp313-cp313-macosx_11_0_arm64.whl diff --git a/.github/workflows/build-vtk.yml b/.github/workflows/build-vtk.yml index 8e64224..fbb4d04 100644 --- a/.github/workflows/build-vtk.yml +++ b/.github/workflows/build-vtk.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu-20.04", "macos-13", "macos-14", "windows-2019"] + os: ["ubuntu-20.04", "macos-13", "macos-14", "macos-15-arm64", "windows-2019"] python-version: ["3.13"] include: - os: "macos-13" @@ -24,6 +24,9 @@ jobs: - os: "macos-14" sed_i: "sed -i '.bak'" shells: "bash" + - os: "macos-15-arm64" + sed_i: "sed -i '.bak'" + shells: "bash" - os: "ubuntu-20.04" sed_i: "sed -i" shells: "bash" @@ -153,10 +156,10 @@ jobs: shell: cmd if: runner.os == 'Windows' && steps.cache-vtk-restore.outputs.cache-hit != 'true' run: | - call C:\Users\runneradmin\micromamba\condabin\micromamba.bat activate build-vtk + call C:\Users\runneradmin\micromamba\condabin\micromamba.bat activate build-vtk call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - cd VTK-${{ env.VTK }}\build + cd VTK-${{ env.VTK }}\build cmake -G Ninja ^ -D VTK_VERSIONED_INSTALL=ON ^ -D VTK_CUSTOM_LIBRARY_SUFFIX="9.3" -DVTK_VERSION_SUFFIX="" ^