Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
ci: Fix caching of release jobs (by having it in the first place) (#59200)
Piotr Osiewicz1d217ee39d38
diff --git a/.github/workflows/release.yml b/.github/workflows/release.ymlindex f7fbff73637..1910a8b5e1f 100644--- a/.github/workflows/release.yml+++ b/.github/workflows/release.yml@@ -367,6 +367,11 @@ jobs:uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfdwith:clean: false+ - name: steps::cache_rust_dependencies_namespace+ uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9+ with:+ cache: rust+ path: ~/.rustup- name: steps::setup_sentryuses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454bwith:@@ -407,6 +412,11 @@ jobs:uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfdwith:clean: false+ - name: steps::cache_rust_dependencies_namespace+ uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9+ with:+ cache: rust+ path: ~/.rustup- name: steps::setup_sentryuses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454bwith:@@ -450,6 +460,11 @@ jobs:uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfdwith:clean: false+ - name: steps::cache_rust_dependencies_namespace+ uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9+ with:+ cache: rust+ path: ~/.rustup- name: steps::setup_nodeuses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020with:@@ -495,6 +510,11 @@ jobs:uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfdwith:clean: false+ - name: steps::cache_rust_dependencies_namespace+ uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9+ with:+ cache: rust+ path: ~/.rustup- name: steps::setup_nodeuses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020with:@@ -548,6 +568,9 @@ jobs:uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454bwith:token: ${{ secrets.SENTRY_AUTH_TOKEN }}+ - name: steps::clear_target_dir_if_large+ run: ./script/clear-target-dir-if-larger-than.ps1 350 200+ shell: pwsh- name: run_bundling::bundle_windows::bundle_windowsrun: script/bundle-windows.ps1 -Architecture aarch64shell: pwsh@@ -593,6 +616,9 @@ jobs:uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454bwith:token: ${{ secrets.SENTRY_AUTH_TOKEN }}+ - name: steps::clear_target_dir_if_large+ run: ./script/clear-target-dir-if-larger-than.ps1 350 200+ shell: pwsh- name: run_bundling::bundle_windows::bundle_windowsrun: script/bundle-windows.ps1 -Architecture x86_64shell: pwshdiff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.ymlindex cdf1ef96e15..aea81ae2a73 100644--- a/.github/workflows/release_nightly.yml+++ b/.github/workflows/release_nightly.yml@@ -104,6 +104,11 @@ jobs:uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfdwith:clean: false+ - name: steps::cache_rust_dependencies_namespace+ uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9+ with:+ cache: rust+ path: ~/.rustup- name: run_bundling::set_release_channel_to_nightlyrun: |set -eu@@ -148,6 +153,11 @@ jobs:uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfdwith:clean: false+ - name: steps::cache_rust_dependencies_namespace+ uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9+ with:+ cache: rust+ path: ~/.rustup- name: run_bundling::set_release_channel_to_nightlyrun: |set -eu@@ -195,6 +205,11 @@ jobs:uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfdwith:clean: false+ - name: steps::cache_rust_dependencies_namespace+ uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9+ with:+ cache: rust+ path: ~/.rustup- name: run_bundling::set_release_channel_to_nightlyrun: |set -eu@@ -244,6 +259,11 @@ jobs:uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfdwith:clean: false+ - name: steps::cache_rust_dependencies_namespace+ uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9+ with:+ cache: rust+ path: ~/.rustup- name: run_bundling::set_release_channel_to_nightlyrun: |set -eu@@ -309,6 +329,9 @@ jobs:uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454bwith:token: ${{ secrets.SENTRY_AUTH_TOKEN }}+ - name: steps::clear_target_dir_if_large+ run: ./script/clear-target-dir-if-larger-than.ps1 350 200+ shell: pwsh- name: run_bundling::bundle_windows::bundle_windowsrun: script/bundle-windows.ps1 -Architecture aarch64shell: pwsh@@ -360,6 +383,9 @@ jobs:uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454bwith:token: ${{ secrets.SENTRY_AUTH_TOKEN }}+ - name: steps::clear_target_dir_if_large+ run: ./script/clear-target-dir-if-larger-than.ps1 350 200+ shell: pwsh- name: run_bundling::bundle_windows::bundle_windowsrun: script/bundle-windows.ps1 -Architecture x86_64shell: pwshdiff --git a/.github/workflows/run_bundling.yml b/.github/workflows/run_bundling.ymlindex 3d3d7a7ac51..17f5136c216 100644--- a/.github/workflows/run_bundling.yml+++ b/.github/workflows/run_bundling.yml@@ -26,6 +26,11 @@ jobs:uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfdwith:clean: false+ - name: steps::cache_rust_dependencies_namespace+ uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9+ with:+ cache: rust+ path: ~/.rustup- name: steps::setup_sentryuses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454bwith:@@ -65,6 +70,11 @@ jobs:uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfdwith:clean: false+ - name: steps::cache_rust_dependencies_namespace+ uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9+ with:+ cache: rust+ path: ~/.rustup- name: steps::setup_sentryuses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454bwith:@@ -107,6 +117,11 @@ jobs:uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfdwith:clean: false+ - name: steps::cache_rust_dependencies_namespace+ uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9+ with:+ cache: rust+ path: ~/.rustup- name: steps::setup_nodeuses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020with:@@ -151,6 +166,11 @@ jobs:uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfdwith:clean: false+ - name: steps::cache_rust_dependencies_namespace+ uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9+ with:+ cache: rust+ path: ~/.rustup- name: steps::setup_nodeuses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020with:@@ -203,6 +223,9 @@ jobs:uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454bwith:token: ${{ secrets.SENTRY_AUTH_TOKEN }}+ - name: steps::clear_target_dir_if_large+ run: ./script/clear-target-dir-if-larger-than.ps1 350 200+ shell: pwsh- name: run_bundling::bundle_windows::bundle_windowsrun: script/bundle-windows.ps1 -Architecture aarch64shell: pwsh@@ -247,6 +270,9 @@ jobs:uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454bwith:token: ${{ secrets.SENTRY_AUTH_TOKEN }}+ - name: steps::clear_target_dir_if_large+ run: ./script/clear-target-dir-if-larger-than.ps1 350 200+ shell: pwsh- name: run_bundling::bundle_windows::bundle_windowsrun: script/bundle-windows.ps1 -Architecture x86_64shell: pwshdiff --git a/tooling/xtask/src/tasks/workflows/run_bundling.rs b/tooling/xtask/src/tasks/workflows/run_bundling.rsindex 7546e93c418..6bc20389ee2 100644--- a/tooling/xtask/src/tasks/workflows/run_bundling.rs+++ b/tooling/xtask/src/tasks/workflows/run_bundling.rs@@ -74,6 +74,7 @@ pub(crate) fn bundle_mac(.runs_on(runners::MAC_DEFAULT).envs(bundle_envs(platform)).add_step(steps::checkout_repo())+ .add_step(steps::cache_rust_dependencies_namespace()).when_some(release_channel, |job, release_channel| {job.add_step(set_release_channel(platform, release_channel))})@@ -117,6 +118,7 @@ pub(crate) fn bundle_linux(.add_env(Env::new("CC", "clang-18")).add_env(Env::new("CXX", "clang++-18")).add_step(steps::checkout_repo())+ .add_step(steps::cache_rust_dependencies_namespace()).when_some(release_channel, |job, release_channel| {job.add_step(set_release_channel(platform, release_channel))})@@ -161,6 +163,7 @@ pub(crate) fn bundle_windows(job.add_step(set_release_channel(platform, release_channel))}).add_step(steps::setup_sentry())+ .add_step(steps::clear_target_dir_if_large(platform)).add_step(bundle_windows(arch)).add_step(upload_artifact(&format!("target/{artifact_name}"))).add_step(upload_artifact(&format!(