-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Initial Linux nightly bundles upload (#8913)
Changes Zed CI to build and upload Linux nightly bundles. * `todo!(linux)` are replaced with `TODO linux` to make `todo!`-based workflows more convenient * renames `run-build-dmg` label into `run-bundling`, also renames a few GH Actions entries to be more generic * make another upload path for Linux, which keeps a separate file with SHA to version the nightly artifact. * adds a `*.deb` package building with a couple of caveats, marked with new `TODO linux` entries: 1. `cargo-bundle` is not very flexible, so it generates artifacts with the structure and names that we're unable to alter before/during the generation. For that, a set of extra steps is made by repacking the *.deb package — this is not very portable between different Linux distros, so later one needs to find a way to combine multiple package types in this script. 2. `cargo-bundle` is not able to properly generate the *.msi bundle despite declaring it in the features: burtonageo/cargo-bundle#116 Windows needs to invent its own way of bundling or fix the tool. 3. Both `cli` and `zed` binaries are added into the archive under `/usr/local/bin/` path with their `-$channel` suffix (-nightly/-preview/-dev/-stable) and a `/usr/local/bin/zed -> /usr/local/bin/cli-nightly` symlink is made to make CLI work as Zed launcher: ``` ~/work/zed kb/linux-nightly:origin/kb/linux-nightly* ❯ dpkg -c target/zed_amd64.deb drwxr-xr-x allaptop/allaptop 0 2024-03-06 00:53 ./ drwxr-xr-x allaptop/allaptop 0 2024-03-06 00:53 ./usr/ drwxr-xr-x allaptop/allaptop 0 2024-03-06 00:53 ./usr/local/ drwxr-xr-x allaptop/allaptop 0 2024-03-06 00:53 ./usr/local/bin/ -rwxr-xr-x allaptop/allaptop 8746832 2024-03-06 00:53 ./usr/local/bin/cli-nightly -rwxr-xr-x allaptop/allaptop 689078560 2024-03-06 00:53 ./usr/local/bin/zed-nightly drwxr-xr-x allaptop/allaptop 0 2024-03-06 00:53 ./usr/share/ drwxr-xr-x allaptop/allaptop 0 2024-03-06 00:53 ./usr/share/applications/ -rw-r--r-- allaptop/allaptop 153 2024-03-06 00:53 ./usr/share/applications/zed.desktop drwxr-xr-x allaptop/allaptop 0 2024-03-06 00:53 ./usr/share/icons/ drwxr-xr-x allaptop/allaptop 0 2024-03-06 00:53 ./usr/share/icons/hicolor/ drwxr-xr-x allaptop/allaptop 0 2024-03-06 00:53 ./usr/share/icons/hicolor/1024x1024@2x/ drwxr-xr-x allaptop/allaptop 0 2024-03-06 00:53 ./usr/share/icons/hicolor/1024x1024@2x/apps/ -rw-r--r-- allaptop/allaptop 716288 2024-03-06 00:53 ./usr/share/icons/hicolor/1024x1024@2x/apps/zed.png drwxr-xr-x allaptop/allaptop 0 2024-03-06 00:53 ./usr/share/icons/hicolor/512x512/ drwxr-xr-x allaptop/allaptop 0 2024-03-06 00:53 ./usr/share/icons/hicolor/512x512/apps/ -rw-r--r-- allaptop/allaptop 239870 2024-03-06 00:53 ./usr/share/icons/hicolor/512x512/apps/zed.png lrwxrwxrwx allaptop/allaptop 0 2024-03-06 00:53 ./usr/local/bin/zed -> /usr/local/bin/cli-nightly ``` But the CLI does not work under Linux yet and there's no way to install that CLI from Zed now; Zed binary itself is not able to open `file/location:12:34`-like things and set up the env properly, but is able to start or open a directory. So, this structure can be considered temporary and changed, if needed. 4. Zed Nightly on Linux does not know how to update itself, so all nightly publishing is not picked up automatically. 5. Rust cache from `main` builds does not get shared between CI jobs, due to being run in a different CI job that forms a different CI key, so ``` - name: Cache dependencies uses: swatinem/rust-cache@v2 with: save-if: ${{ false }} ``` would not work. This makes Linux bundling jobs long. Release Notes: - N/A
- Loading branch information
1 parent
e85f190
commit ffebe2e
Showing
9 changed files
with
295 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ name = "zed" | |
| version = "0.127.0" | ||
| publish = false | ||
| license = "GPL-3.0-or-later" | ||
| authors = ["Zed Team <[email protected]>"] | ||
|
|
||
| [lints] | ||
| workspace = true | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -euxo pipefail | ||
|
|
||
| build_flag="--release" | ||
| target_dir="release" | ||
| bundle_name="" | ||
| zed_crate="zed" | ||
|
|
||
|
|
||
| help_info() { | ||
| echo " | ||
| Usage: ${0##*/} [options] [bundle_name] | ||
| Build the application bundle for Linux. | ||
| Options: | ||
| -d Compile in debug mode | ||
| -h Display this help and exit | ||
| " | ||
| } | ||
|
|
||
| while getopts 'dh' flag | ||
| do | ||
| case "${flag}" in | ||
| d) | ||
| export CARGO_INCREMENTAL=true | ||
| export CARGO_BUNDLE_SKIP_BUILD=true | ||
| build_flag=""; | ||
| target_dir="debug" | ||
| ;; | ||
| h) | ||
| help_info | ||
| exit 0 | ||
| ;; | ||
| esac | ||
| done | ||
|
|
||
| shift $((OPTIND-1)) | ||
|
|
||
| if [[ $# -gt 0 ]]; then | ||
| if [ "$1" ]; then | ||
| bundle_name=$1 | ||
| fi | ||
| fi | ||
|
|
||
| export ZED_BUNDLE=true | ||
|
|
||
| cargo_bundle_version=$(cargo -q bundle --help 2>&1 | head -n 1 || echo "") | ||
| if [ "$cargo_bundle_version" != "cargo-bundle v0.6.0-zed" ]; then | ||
| cargo install cargo-bundle --git https://github.com/zed-industries/cargo-bundle.git --branch zed-deploy | ||
| fi | ||
|
|
||
| echo "Compiling zed binaries" | ||
| cargo build ${build_flag} --package ${zed_crate} --package cli | ||
|
|
||
| echo "Creating application bundle" | ||
| # TODO linux | ||
| # Here, hacks to make `cargo bundle` run work, but macOS does not need these | ||
| # Most probably, needs https://github.com/zed-industries/cargo-bundle/commit/9e185bd44d968d8039192220603494555afdbb4f from the upstream. | ||
| cp "target/${target_dir}/Zed" "target/${target_dir}/zed" | ||
| pushd crates/${zed_crate} | ||
| channel=$(<RELEASE_CHANNEL) | ||
| cp Cargo.toml Cargo.toml.backup | ||
| sed \ | ||
| -i.backup -e \ | ||
| "s/package.metadata.bundle-${channel}/package.metadata.bundle/" \ | ||
| Cargo.toml | ||
|
|
||
| # TODO linux `zed_cli` does not get into this bundle despite being built | ||
| bundle_path=$(cargo bundle ${build_flag} --select-workspace-root | xargs) | ||
|
|
||
| mv Cargo.toml.backup Cargo.toml | ||
| popd | ||
|
|
||
| # For nightly, cut off the version out of the bundle name that `cargo bundle` always adds. | ||
| if [ "$channel" == "nightly" ]; then | ||
| version="$(cargo metadata --no-deps --manifest-path crates/zed/Cargo.toml --offline --format-version=1 | jq -r '.packages | map(select(.name == "zed"))[0].version')" | ||
| version_less_bundle_path=$(echo "$bundle_path" | sed "s/_$version//") | ||
| mv "$bundle_path" "$version_less_bundle_path" | ||
| bundle_path="$version_less_bundle_path" | ||
| fi | ||
|
|
||
| # TODO linux | ||
| # Other Linux systems will need a different set of manipulations + a way to know which ones to do. | ||
| # If bundle_name is not set or empty, use the basename of $bundle_path | ||
| if [ -z "${bundle_name}" ]; then | ||
| bundle_name=$(basename "${bundle_path}") | ||
| fi | ||
| # If bundle_name doesn't end in .deb, append it | ||
| if [[ "$bundle_name" != *.deb ]]; then | ||
| bundle_name="$bundle_name.deb" | ||
| fi | ||
|
|
||
| pushd target/ | ||
| rm -rf bundle/ 2>/dev/null || true | ||
| dpkg-deb -x "${bundle_path}" bundle/ | ||
| dpkg-deb --control "${bundle_path}" bundle/DEBIAN | ||
| mkdir -p bundle/usr/local/bin/ | ||
| mv bundle/usr/bin/zed "bundle/usr/local/bin/zed-$channel" | ||
| cp "${target_dir}/cli" "bundle/usr/local/bin/cli-$channel" | ||
| ln -s "/usr/local/bin/cli-$channel" "bundle/usr/local/bin/zed" | ||
| rm -rf bundle/usr/bin/ | ||
| dpkg-deb -b bundle/ "${target_dir}/${bundle_name}" | ||
| bundle_path="${PWD}/${target_dir}/${bundle_name}" | ||
| popd | ||
| echo "Bundled ${bundle_path}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.