Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Secrets SDK CI to work with MacOS ARM runners #2155

Merged
merged 4 commits into from
May 24, 2024
Merged

Fix Secrets SDK CI to work with MacOS ARM runners #2155

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91f6572
Fix Secrets SDK CI to work with MacOS ARM runners
t1m0thyj May 24, 2024
99de1cc
Set Node.js architecture for Mac x64 tests
t1m0thyj May 24, 2024
b9453f4
Merge branch 'next' into ci/fix-secrets-sdk-build
t1m0thyj May 24, 2024
82b8ffb
Merge branch 'next' into ci/fix-secrets-sdk-build
t1m0thyj May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions .github/workflows/secrets-sdk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Comment on lines -71 to -76
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its not convenient that the pipeline broke, but at least we were able to remove these steps from the aarch64 build 😋

build: npm run build -- --target aarch64-apple-darwin
- host: ubuntu-latest
target: aarch64-unknown-linux-gnu
use-cross: true
Expand Down Expand Up @@ -210,8 +203,11 @@ 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
architecture: x64
- host: ubuntu-latest
target: x86_64-unknown-linux-gnu
- host: ubuntu-latest
Expand All @@ -237,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
Expand Down
Loading