From 89fe4f15ef450ff18998a47f1479ed1529cc977e Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Fri, 23 Sep 2022 21:32:49 +0200 Subject: [PATCH 1/4] Node CI on macos-12-arm --- .github/workflows/node-ci.yml | 2 +- .github/workflows/node-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml index 6fe1af267ee..6c83709321d 100644 --- a/.github/workflows/node-ci.yml +++ b/.github/workflows/node-ci.yml @@ -76,7 +76,7 @@ jobs: strategy: matrix: os: - - macos-12 + - macos-12-arm - ubuntu-20.04 node: [ 14, 16, 18 ] name: OS ${{ matrix.os }} Node ${{ matrix.node }} diff --git a/.github/workflows/node-release.yml b/.github/workflows/node-release.yml index 37885fc93ee..93213ccf4db 100644 --- a/.github/workflows/node-release.yml +++ b/.github/workflows/node-release.yml @@ -45,7 +45,7 @@ jobs: strategy: matrix: os: - - macos-12 + - macos-12-arm - ubuntu-20.04 node: [ 14, 16, 18 ] name: OS ${{ matrix.os }} Node ${{ matrix.node }} From c6bc54d7164e2bced9599aedb4a1ba2f7ba54a0f Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Fri, 23 Sep 2022 23:36:36 +0200 Subject: [PATCH 2/4] make universal build --- .github/workflows/node-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml index 6c83709321d..57adc96bb7b 100644 --- a/.github/workflows/node-ci.yml +++ b/.github/workflows/node-ci.yml @@ -161,7 +161,7 @@ jobs: - name: CMake if: runner.os == 'macOS' run: | - cmake . -B build -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} -DMBGL_WITH_COVERAGE=ON + cmake . -B build -G Ninja -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} -DMBGL_WITH_COVERAGE=ON - name: CMake if: runner.os == 'Linux' From 318c47ce7d06d62308a1738b7632c801bd23b665 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Fri, 23 Sep 2022 23:37:33 +0200 Subject: [PATCH 3/4] add universal build --- .github/workflows/node-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node-release.yml b/.github/workflows/node-release.yml index 93213ccf4db..ef164673cd7 100644 --- a/.github/workflows/node-release.yml +++ b/.github/workflows/node-release.yml @@ -134,7 +134,7 @@ jobs: - name: CMake if: runner.os == 'macOS' run: | - cmake . -B build -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} -DMBGL_WITH_COVERAGE=ON + cmake . -B build -G Ninja -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} -DMBGL_WITH_COVERAGE=ON sed -i -e 's/$(ARCHS_STANDARD)/x86_64/g' build/build.ninja sed -i -e 's/-arch arm64e/-arch x86_64/g' build/build.ninja From 5f23555cc4848082fe8629b481986868952b2b26 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Fri, 23 Sep 2022 23:54:15 +0200 Subject: [PATCH 4/4] ade quotes --- .github/workflows/node-ci.yml | 2 +- .github/workflows/node-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml index 57adc96bb7b..bdaadd3b145 100644 --- a/.github/workflows/node-ci.yml +++ b/.github/workflows/node-ci.yml @@ -161,7 +161,7 @@ jobs: - name: CMake if: runner.os == 'macOS' run: | - cmake . -B build -G Ninja -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} -DMBGL_WITH_COVERAGE=ON + cmake . -B build -G Ninja -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} -DMBGL_WITH_COVERAGE=ON - name: CMake if: runner.os == 'Linux' diff --git a/.github/workflows/node-release.yml b/.github/workflows/node-release.yml index ef164673cd7..6f677e78485 100644 --- a/.github/workflows/node-release.yml +++ b/.github/workflows/node-release.yml @@ -134,7 +134,7 @@ jobs: - name: CMake if: runner.os == 'macOS' run: | - cmake . -B build -G Ninja -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} -DMBGL_WITH_COVERAGE=ON + cmake . -B build -G Ninja -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=${{ env.BUILDTYPE }} -DMBGL_WITH_COVERAGE=ON sed -i -e 's/$(ARCHS_STANDARD)/x86_64/g' build/build.ninja sed -i -e 's/-arch arm64e/-arch x86_64/g' build/build.ninja