From c57bb4b831eed3a812c39a04e6826ae00c59af04 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Sun, 2 Nov 2025 23:32:57 -0700 Subject: [PATCH] One more layer of indirection, gone. --- .github/workflows/release.yml | 12 +++++------ .github/workflows/release_nightly.yml | 12 +++++------ .github/workflows/run_bundling.yml | 12 +++++------ .../xtask/src/tasks/workflows/run_bundling.rs | 20 +++++++++---------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d43bf8013904238d2277d2d9901d6893bdac5969..ef05c1b199e84f52b07a4dd23a04c916f86f8be6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -205,13 +205,13 @@ jobs: uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: zed-linux-aarch64.tar.gz - path: target/release/zed-*.tar.gz + path: target/release/zed-linux-aarch64.tar.gz if-no-files-found: error - name: '@actions/upload-artifact zed-remote-server-linux-aarch64.gz' uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: zed-remote-server-linux-aarch64.gz - path: target/zed-remote-server-*.gz + path: target/zed-remote-server-linux-aarch64.gz if-no-files-found: error timeout-minutes: 60 bundle_linux_x86_64: @@ -245,13 +245,13 @@ jobs: uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: zed-linux-x86_64.tar.gz - path: target/release/zed-*.tar.gz + path: target/release/zed-linux-x86_64.tar.gz if-no-files-found: error - name: '@actions/upload-artifact zed-remote-server-linux-x86_64.gz' uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: zed-remote-server-linux-x86_64.gz - path: target/zed-remote-server-*.gz + path: target/zed-remote-server-linux-x86_64.gz if-no-files-found: error timeout-minutes: 60 bundle_mac_aarch64: @@ -381,7 +381,7 @@ jobs: uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: Zed-aarch64.exe - path: ${{ env.SETUP_PATH }} + path: target/Zed-aarch64.exe if-no-files-found: error timeout-minutes: 60 bundle_windows_x86_64: @@ -419,7 +419,7 @@ jobs: uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: Zed-x86_64.exe - path: ${{ env.SETUP_PATH }} + path: target/Zed-x86_64.exe if-no-files-found: error timeout-minutes: 60 upload_release_assets: diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml index c13970b25902c4ad85ecd398570985d7a7632f71..f3efe70a498e5718740adca572358c8b7bb81609 100644 --- a/.github/workflows/release_nightly.yml +++ b/.github/workflows/release_nightly.yml @@ -100,13 +100,13 @@ jobs: uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: zed-linux-aarch64.tar.gz - path: target/release/zed-*.tar.gz + path: target/release/zed-linux-aarch64.tar.gz if-no-files-found: error - name: '@actions/upload-artifact zed-remote-server-linux-aarch64.gz' uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: zed-remote-server-linux-aarch64.gz - path: target/zed-remote-server-*.gz + path: target/zed-remote-server-linux-aarch64.gz if-no-files-found: error timeout-minutes: 60 bundle_linux_x86_64: @@ -147,13 +147,13 @@ jobs: uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: zed-linux-x86_64.tar.gz - path: target/release/zed-*.tar.gz + path: target/release/zed-linux-x86_64.tar.gz if-no-files-found: error - name: '@actions/upload-artifact zed-remote-server-linux-x86_64.gz' uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: zed-remote-server-linux-x86_64.gz - path: target/zed-remote-server-*.gz + path: target/zed-remote-server-linux-x86_64.gz if-no-files-found: error timeout-minutes: 60 bundle_mac_aarch64: @@ -305,7 +305,7 @@ jobs: uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: Zed-aarch64.exe - path: ${{ env.SETUP_PATH }} + path: target/Zed-aarch64.exe if-no-files-found: error timeout-minutes: 60 bundle_windows_x86_64: @@ -351,7 +351,7 @@ jobs: uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: Zed-x86_64.exe - path: ${{ env.SETUP_PATH }} + path: target/Zed-x86_64.exe if-no-files-found: error timeout-minutes: 60 build_nix_linux_x86_64: diff --git a/.github/workflows/run_bundling.yml b/.github/workflows/run_bundling.yml index 70366718f31b24b2799724e50a2bed46545df8b6..5cf10d11f3f9444c9b57f594897dbfa0e435f0b4 100644 --- a/.github/workflows/run_bundling.yml +++ b/.github/workflows/run_bundling.yml @@ -41,13 +41,13 @@ jobs: uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: zed-linux-aarch64.tar.gz - path: target/release/zed-*.tar.gz + path: target/release/zed-linux-aarch64.tar.gz if-no-files-found: error - name: '@actions/upload-artifact zed-remote-server-linux-aarch64.gz' uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: zed-remote-server-linux-aarch64.gz - path: target/zed-remote-server-*.gz + path: target/zed-remote-server-linux-aarch64.gz if-no-files-found: error timeout-minutes: 60 bundle_linux_x86_64: @@ -81,13 +81,13 @@ jobs: uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: zed-linux-x86_64.tar.gz - path: target/release/zed-*.tar.gz + path: target/release/zed-linux-x86_64.tar.gz if-no-files-found: error - name: '@actions/upload-artifact zed-remote-server-linux-x86_64.gz' uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: zed-remote-server-linux-x86_64.gz - path: target/zed-remote-server-*.gz + path: target/zed-remote-server-linux-x86_64.gz if-no-files-found: error timeout-minutes: 60 bundle_mac_aarch64: @@ -217,7 +217,7 @@ jobs: uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: Zed-aarch64.exe - path: ${{ env.SETUP_PATH }} + path: target/Zed-aarch64.exe if-no-files-found: error timeout-minutes: 60 bundle_windows_x86_64: @@ -255,7 +255,7 @@ jobs: uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: name: Zed-x86_64.exe - path: ${{ env.SETUP_PATH }} + path: target/Zed-x86_64.exe if-no-files-found: error timeout-minutes: 60 concurrency: diff --git a/tooling/xtask/src/tasks/workflows/run_bundling.rs b/tooling/xtask/src/tasks/workflows/run_bundling.rs index 18f85b0b06a19eedeb13d6b8fd6e415ab46f67d0..1f955bbca872f6accfc8f2067d4465ef65d122ee 100644 --- a/tooling/xtask/src/tasks/workflows/run_bundling.rs +++ b/tooling/xtask/src/tasks/workflows/run_bundling.rs @@ -78,12 +78,12 @@ pub(crate) fn bundle_mac( .add_step(steps::clear_target_dir_if_large(runners::Platform::Mac)) .add_step(bundle_mac(arch)) .add_step(steps::upload_artifact( - &artifact_name, - &format!("target/{arch}-apple-darwin/release/Zed-{arch}.dmg"), + artifact_name, + &format!("target/{arch}-apple-darwin/release/{artifact_name}"), )) .add_step(steps::upload_artifact( - &remote_server_artifact_name, - &format!("target/zed-remote-server-macos-{arch}.gz"), + remote_server_artifact_name, + &format!("target/{remote_server_artifact_name}"), )), } } @@ -115,12 +115,12 @@ pub(crate) fn bundle_linux( .map(steps::install_linux_dependencies) .add_step(steps::script("./script/bundle-linux")) .add_step(steps::upload_artifact( - &artifact_name, - "target/release/zed-*.tar.gz", + artifact_name, + &format!("target/release/{artifact_name}"), )) .add_step(steps::upload_artifact( - &remote_server_artifact_name, - "target/zed-remote-server-*.gz", + remote_server_artifact_name, + &format!("target/{remote_server_artifact_name}"), )), } } @@ -154,8 +154,8 @@ pub(crate) fn bundle_windows( .add_step(steps::setup_sentry()) .add_step(bundle_windows(arch)) .add_step(steps::upload_artifact( - &artifact_name, - "${{ env.SETUP_PATH }}", + artifact_name, + &format!("target/{artifact_name}"), )), } }