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

[WIP] chore: Distribute non-universal binaries on Mac #9284

Merged
merged 14 commits into from
Mar 15, 2024
Merged

[WIP] chore: Distribute non-universal binaries on Mac #9284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fa35d2a
In local builds, build cli together with zed
osiewicz Mar 13, 2024
b6c5f37
WIP: Separate binaries on Mac
osiewicz Mar 13, 2024
2746075
Wrap arguments in quotes
osiewicz Mar 13, 2024
8001119
fix up CI
osiewicz Mar 13, 2024
1040f74
Change paths where Zed.dmg is placed
osiewicz Mar 13, 2024
f8489b0
Sign final .dmg
osiewicz Mar 14, 2024
5c467d9
fixup! Sign final .dmg
osiewicz Mar 14, 2024
be75a0c
Merge branch 'main' into no-fat-binaries
osiewicz Mar 14, 2024
097d8cd
Merge branch 'main' into no-fat-binaries
osiewicz Mar 14, 2024
64092fa
Set up keychain around signing .dmgs
osiewicz Mar 14, 2024
ff81293
Bring back bundling of universal binary
osiewicz Mar 15, 2024
92e16dd
Fix up path to cp
osiewicz Mar 15, 2024
ae37558
Yet another stab
osiewicz Mar 15, 2024
1fd85f5
Update bundle-mac
osiewicz Mar 15, 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
19 changes: 17 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,20 +209,35 @@ jobs:
- name: Create macOS app bundle
run: script/bundle-mac

- name: Upload app bundle to workflow run if main branch or specific label
- name: Upload app bundle (universal) to workflow run if main branch or specific label
uses: actions/upload-artifact@v4
if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
with:
name: Zed_${{ github.event.pull_request.head.sha || github.sha }}.dmg
path: target/release/Zed.dmg
- name: Upload app bundle (aarch64) to workflow run if main branch or specific label
uses: actions/upload-artifact@v4
if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
with:
name: Zed_${{ github.event.pull_request.head.sha || github.sha }}_aarch64.dmg
path: target/aarch64-apple-darwin/release/Zed.dmg

- name: Upload app bundle (x86_64) to workflow run if main branch or specific label
uses: actions/upload-artifact@v4
if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
with:
name: Zed_${{ github.event.pull_request.head.sha || github.sha }}_x86_64.dmg
path: target/x86_64-apple-darwin/release/Zed.dmg

- uses: softprops/action-gh-release@v1
name: Upload app bundle to release
if: ${{ env.RELEASE_CHANNEL == 'preview' || env.RELEASE_CHANNEL == 'stable' }}
with:
draft: true
prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
files: target/release/Zed.dmg
files: |
target/aarch64-apple-darwin/release/Zed.dmg
target/x86_64-apple-darwin/release/Zed.dmg
body: ""
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
Loading
Loading