Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

ci: Fix bwrap jobs on `run_bundling` (#59765)

Finn Evers1e7f1a11f992
diff --git a/.github/workflows/run_bundling.yml b/.github/workflows/run_bundling.yml
index 30de6521b39..2552d9186c7 100644
--- a/.github/workflows/run_bundling.yml
+++ b/.github/workflows/run_bundling.yml
@@ -99,6 +99,9 @@ jobs:
if-no-files-found: error
timeout-minutes: 60
build_static_bwrap_linux_aarch64:
+ if: |-
+ (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
+ (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
runs-on: namespace-profile-8x32-ubuntu-2004-arm-m4
steps:
- name: steps::cache_nix_dependencies_namespace
@@ -130,6 +133,9 @@ jobs:
if-no-files-found: error
timeout-minutes: 60
build_static_bwrap_linux_x86_64:
+ if: |-
+ (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
+ (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
runs-on: namespace-profile-32x64-ubuntu-2004
steps:
- name: steps::cache_nix_dependencies_namespace
diff --git a/tooling/xtask/src/tasks/workflows/run_bundling.rs b/tooling/xtask/src/tasks/workflows/run_bundling.rs
index d5d1bf3c985..e9ed32c610c 100644
--- a/tooling/xtask/src/tasks/workflows/run_bundling.rs
+++ b/tooling/xtask/src/tasks/workflows/run_bundling.rs
@@ -114,7 +114,7 @@ pub(crate) fn build_static_bwrap(arch: Arch, deps: &[&NamedJob]) -> NamedJob {
NamedJob {
name: format!("build_static_bwrap_linux_{arch}"),
- job: dependant_job(deps)
+ job: bundle_job(deps)
.runs_on(arch.linux_bundler())
.timeout_minutes(60u32)
.add_step(steps::cache_nix_dependencies_namespace())