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.

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

Fix Intel Mac CI builds. #118

Merged
merged 3 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
os: ubuntu-latest
- build: x86_64-macos
os: macos-latest
target: x86_64-apple-darwin
- build: aarch64-macos
os: macos-latest
target: aarch64-apple-darwin
cfallin marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
os: ubuntu-latest
- build: x86_64-macos
os: macos-latest
target: x86_64-apple-darwin
- build: aarch64-macos
os: macos-latest
target: aarch64-apple-darwin
Expand Down Expand Up @@ -57,7 +58,7 @@ jobs:
# Assemble release artifats appropriate for this platform, then upload them
# unconditionally to this workflow's files so we have a copy of them.
- run: ./ci/build-tarballs.sh "${{ matrix.build }}" "${{ matrix.target }}"
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v4
with:
name: bins-${{ matrix.build }}
path: dist
Expand All @@ -69,31 +70,31 @@ jobs:
# Download all the artifacts that we'll be publishing. Should keep an eye on
# the `download-artifact` repository to see if we can ever get something
# like "download all artifacts" or "download this list of artifacts"
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: bins-x86_64-macos
path: dist
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: bins-aarch64-macos
path: dist
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: bins-x86_64-windows
path: dist
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: bins-x86_64-mingw
path: dist
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: bins-x86_64-linux
path: dist
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: bins-aarch64-linux
path: dist
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: bins-s390x-linux
path: dist
Expand Down
Loading