re-use code

Conrad Irwin created 11 hours ago

Change summary

.github/workflows/release.yml                        |  2 
.github/workflows/release_nightly.yml                |  2 
tooling/xtask/src/tasks/workflows/release.rs         | 24 +++++++-------
tooling/xtask/src/tasks/workflows/release_nightly.rs | 17 ++-------
4 files changed, 18 insertions(+), 27 deletions(-)

Detailed changes

.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

.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

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<Use> {
-        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<Use> {
+    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)

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<Use> {
-        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())