Skip to content

Commit

Permalink
Include generate-licenses into bundle-mac script (#22800)
Browse files Browse the repository at this point in the history
Closes #21613

Same as `bundle-linux`, to avoid panicking on missing licenses for
homegrown-built releases when `Help -> View dependency licenses` menu
action is triggered.

Release Notes:

- Altered bundle-mac script to generate licenses
  • Loading branch information
SomeoneToIgnore authored Jan 7, 2025
1 parent a331497 commit eae88a5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -322,9 +322,6 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Generate license file
run: script/generate-licenses

- name: Create macOS app bundle
run: script/bundle-mac

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/release_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ jobs:
echo "Publishing version: ${version} on release channel nightly"
echo "nightly" > crates/zed/RELEASE_CHANNEL
- name: Generate license file
run: script/generate-licenses

- name: Create macOS app bundle
run: script/bundle-mac

Expand Down
3 changes: 3 additions & 0 deletions script/bundle-mac
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ version_info=$(rustc --version --verbose)
host_line=$(echo "$version_info" | grep host)
local_target_triple=${host_line#*: }

# Generate the licenses first, so they can be baked into the binaries
script/generate-licenses

if [ "$local_arch" = true ]; then
echo "Building for local target only."
cargo build ${build_flag} --package zed --package cli --package remote_server
Expand Down

0 comments on commit eae88a5

Please sign in to comment.