From 53406cf4976281bfa4d45f16f2e998319031176b Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Sun, 2 Nov 2025 22:31:51 -0700 Subject: [PATCH] re-use code --- .github/workflows/release.yml | 2 +- .github/workflows/release_nightly.yml | 2 +- tooling/xtask/src/tasks/workflows/release.rs | 24 +++++++++---------- .../src/tasks/workflows/release_nightly.rs | 17 ++++--------- 4 files changed, 18 insertions(+), 27 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e5de40c89ec57bd73b6717b88bf566c902841b7c..04d9e4d456d417cd18f8954360324d17e13a5370 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -490,7 +490,7 @@ jobs: shell: bash -euxo pipefail {0} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: release::auto_release_preview::create_sentry_release + - name: release::create_sentry_release uses: getsentry/action-release@526942b68292201ac6bbb99b9a0747d4abee354c with: environment: production diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml index f06216a9d6e0be0ff43353ae9e6a5cbcee6f8882..9fb255cd0760d0caaf68704ec6065a7881f7a7df 100644 --- a/.github/workflows/release_nightly.yml +++ b/.github/workflows/release_nightly.yml @@ -494,7 +494,7 @@ jobs: git tag -f nightly git push origin nightly --force shell: bash -euxo pipefail {0} - - name: release_nightly::update_nightly_tag_job::create_sentry_release + - name: release::create_sentry_release uses: getsentry/action-release@526942b68292201ac6bbb99b9a0747d4abee354c with: environment: production diff --git a/tooling/xtask/src/tasks/workflows/release.rs b/tooling/xtask/src/tasks/workflows/release.rs index 95af92030e4d3de537ef1a44eb48d3643990ef72..350b8c803a8c2cc40b50a7eae662ccd6da3d3893 100644 --- a/tooling/xtask/src/tasks/workflows/release.rs +++ b/tooling/xtask/src/tasks/workflows/release.rs @@ -82,19 +82,19 @@ impl ReleaseBundleJobs { } } -fn auto_release_preview(deps: &[&NamedJob; 1]) -> NamedJob { - fn create_sentry_release() -> Step { - named::uses( - "getsentry", - "action-release", - "526942b68292201ac6bbb99b9a0747d4abee354c", // v3 - ) - .add_env(("SENTRY_ORG", "zed-dev")) - .add_env(("SENTRY_PROJECT", "zed")) - .add_env(("SENTRY_AUTH_TOKEN", "${{ secrets.SENTRY_AUTH_TOKEN }}")) - .add_with(("environment", "production")) - } +pub(crate) fn create_sentry_release() -> Step { + named::uses( + "getsentry", + "action-release", + "526942b68292201ac6bbb99b9a0747d4abee354c", // v3 + ) + .add_env(("SENTRY_ORG", "zed-dev")) + .add_env(("SENTRY_PROJECT", "zed")) + .add_env(("SENTRY_AUTH_TOKEN", "${{ secrets.SENTRY_AUTH_TOKEN }}")) + .add_with(("environment", "production")) +} +fn auto_release_preview(deps: &[&NamedJob; 1]) -> NamedJob { named::job( dependant_job(deps) .runs_on(runners::LINUX_SMALL) diff --git a/tooling/xtask/src/tasks/workflows/release_nightly.rs b/tooling/xtask/src/tasks/workflows/release_nightly.rs index f99bce63eb5429febd9ab2c97f3edbb072f51613..f557a26f670320a452d83cbc7d48cbabf115b8df 100644 --- a/tooling/xtask/src/tasks/workflows/release_nightly.rs +++ b/tooling/xtask/src/tasks/workflows/release_nightly.rs @@ -1,6 +1,9 @@ use crate::tasks::workflows::{ nix_build::build_nix, - release::{ReleaseBundleJobs, download_workflow_artifacts, prep_release_artifacts}, + release::{ + ReleaseBundleJobs, create_sentry_release, download_workflow_artifacts, + prep_release_artifacts, + }, run_bundling::{bundle_linux, bundle_mac, bundle_windows}, run_tests::run_platform_tests, runners::{Arch, Platform, ReleaseChannel}, @@ -103,18 +106,6 @@ fn update_nightly_tag_job(bundle: &ReleaseBundleJobs) -> NamedJob { "#}) } - fn create_sentry_release() -> Step { - named::uses( - "getsentry", - "action-release", - "526942b68292201ac6bbb99b9a0747d4abee354c", // v3 - ) - .add_env(("SENTRY_ORG", "zed-dev")) - .add_env(("SENTRY_PROJECT", "zed")) - .add_env(("SENTRY_AUTH_TOKEN", vars::SENTRY_AUTH_TOKEN)) - .add_with(("environment", "production")) - } - NamedJob { name: "update_nightly_tag".to_owned(), job: steps::release_job(&bundle.jobs())