From 91f6572290b926d2d021d8fc1c00b6c168981e2f Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 24 May 2024 10:49:09 -0400 Subject: [PATCH 1/2] Fix Secrets SDK CI to work with MacOS ARM runners Signed-off-by: Timothy Johnson --- .github/workflows/secrets-sdk.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/secrets-sdk.yml b/.github/workflows/secrets-sdk.yml index f1c94da3cf..58f321392f 100644 --- a/.github/workflows/secrets-sdk.yml +++ b/.github/workflows/secrets-sdk.yml @@ -29,10 +29,9 @@ jobs: settings: - host: macos-latest target: x86_64-apple-darwin - build: | - npm run build + build: npm run build -- --target x86_64-apple-darwin - host: windows-latest - build: npm run build + build: npm run build -- --target x86_64-pc-windows-msvc target: x86_64-pc-windows-msvc - host: windows-latest build: | @@ -67,13 +66,7 @@ jobs: CARGO=cross npm run build -- --target x86_64-unknown-linux-musl - host: macos-latest target: aarch64-apple-darwin - build: | - sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*; - export CC=$(xcrun -f clang); - export CXX=$(xcrun -f clang++); - SYSROOT=$(xcrun --sdk macosx --show-sdk-path); - export CFLAGS="-isysroot $SYSROOT -isystem $SYSROOT"; - npm run build -- --target aarch64-apple-darwin + build: npm run build -- --target aarch64-apple-darwin - host: ubuntu-latest target: aarch64-unknown-linux-gnu use-cross: true @@ -210,6 +203,8 @@ jobs: settings: - host: windows-latest target: x86_64-pc-windows-msvc + - host: macos-latest + target: aarch64-apple-darwin - host: macos-latest target: x86_64-apple-darwin - host: ubuntu-latest From 99de1cc5985ea15114c50b46dc5bce500d91bef9 Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Fri, 24 May 2024 10:57:47 -0400 Subject: [PATCH 2/2] Set Node.js architecture for Mac x64 tests Signed-off-by: Timothy Johnson --- .github/workflows/secrets-sdk.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/secrets-sdk.yml b/.github/workflows/secrets-sdk.yml index 58f321392f..7f59ab1125 100644 --- a/.github/workflows/secrets-sdk.yml +++ b/.github/workflows/secrets-sdk.yml @@ -207,6 +207,7 @@ jobs: target: aarch64-apple-darwin - host: macos-latest target: x86_64-apple-darwin + architecture: x64 - host: ubuntu-latest target: x86_64-unknown-linux-gnu - host: ubuntu-latest @@ -232,6 +233,7 @@ jobs: node-version: ${{ matrix.node }} check-latest: true cache: npm + architecture: ${{ matrix.settings.architecture }} - name: Install dependencies run: npm ci --ignore-scripts - name: Download artifacts