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

[CI] Set right architecture for x64 macOS release artifact #3080

Merged
merged 1 commit into from
Nov 7, 2024
+6 −1
Merged

[CI] Set right architecture for x64 macOS release artifact #3080

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,17 @@ jobs:
- os-name: linux
os: ubuntu-20.04
bazel-config: release_linux
target-arch: X64
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is redundant at present (all releases built on GitHub Actions are for x86), but I plan to build the Apple Silicon release here too some time after #3079 has landed. Open to alternative suggestions.

Copy link
Member

Choose a reason for hiding this comment

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

It's pretty good as-is imo

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

👍
Merged and seems to work correctly now, thanks for approving!

- os-name: macOS
# This configuration is used for cross-compiling – macos-15 is Apple Silicon-based but
# we use it to compile the x64 release.
os: macos-15
bazel-config: release_macos
target-arch: X64
- os-name: windows
os: windows-2022
bazel-config: release_windows
target-arch: X64
runs-on: ${{ matrix.os }}
name: build (${{ matrix.os-name }})
steps:
Expand Down Expand Up @@ -126,7 +131,7 @@ jobs:
- name: Upload binary
uses: actions/upload-artifact@v4
with:
name: ${{ runner.os }}-${{ runner.arch }}-binary
name: ${{ runner.os }}-${{ matrix.target-arch }}-binary
path: bazel-bin/src/workerd/server/workerd${{ runner.os == 'Windows' && '.exe' || '' }}

upload-artifacts:
Expand Down