From eae88a5c47b6bad9d9e7ffb7c40d505f06684c4a Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Wed, 8 Jan 2025 00:22:57 +0200 Subject: [PATCH] Include generate-licenses into bundle-mac script (#22800) Closes https://github.com/zed-industries/zed/issues/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 --- .github/workflows/ci.yml | 3 --- .github/workflows/release_nightly.yml | 3 --- script/bundle-mac | 3 +++ 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9d322294e260f..8dfe3f2f2fbf46 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml index 6e81990db592ee..cb79181cafae74 100644 --- a/.github/workflows/release_nightly.yml +++ b/.github/workflows/release_nightly.yml @@ -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 diff --git a/script/bundle-mac b/script/bundle-mac index e70aa89097ac1d..61fc534cc7db31 100755 --- a/script/bundle-mac +++ b/script/bundle-mac @@ -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