From 4f8c3782cc8e51e745f3d74f0c1cfdac9f2294bb Mon Sep 17 00:00:00 2001
From: Ben Kunkle <ben@zed.dev>
Date: Fri, 31 Oct 2025 13:29:13 -0700
Subject: [PATCH] Fix `release.yml` workflow (#41675)

Closes #ISSUE

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 .github/workflows/release.yml                |  8 ++++++++
 tooling/xtask/src/tasks/workflows/release.rs | 18 ++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f4ee031d0b39e15734173aa27441d867f03cf2c3..5f867996c66c2e2f02052e0e9d33000897bdd3af 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -162,6 +162,14 @@ jobs:
     - name: mkdir -p target/
       run: mkdir -p target/
       shell: bash -euxo pipefail {0}
+    - name: release::create_draft_release::generate_release_notes
+      run: node --redirect-warnings=/dev/null ./script/draft-release-notes "$RELEASE_VERSION" "$RELEASE_CHANNEL" > target/release-notes.md
+      shell: bash -euxo pipefail {0}
+    - name: release::create_draft_release::create_release
+      run: script/create-draft-release target/release-notes.md
+      shell: bash -euxo pipefail {0}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     timeout-minutes: 60
   bundle_linux_arm64:
     needs:
diff --git a/tooling/xtask/src/tasks/workflows/release.rs b/tooling/xtask/src/tasks/workflows/release.rs
index fda383dca5622764fe028232a7ceccde49e327a1..ee2e2cb17de0c5ea342d15b0f0a1bba7dfc8adac 100644
--- a/tooling/xtask/src/tasks/workflows/release.rs
+++ b/tooling/xtask/src/tasks/workflows/release.rs
@@ -164,6 +164,17 @@ fn upload_release_assets(deps: &[&NamedJob], bundle_jobs: &ReleaseBundleJobs) ->
 }
 
 fn create_draft_release() -> NamedJob {
+    fn generate_release_notes() -> Step<Run> {
+        named::bash(
+            r#"node --redirect-warnings=/dev/null ./script/draft-release-notes "$RELEASE_VERSION" "$RELEASE_CHANNEL" > target/release-notes.md"#,
+        )
+    }
+
+    fn create_release() -> Step<Run> {
+        named::bash("script/create-draft-release target/release-notes.md")
+            .add_env(("GITHUB_TOKEN", "${{ secrets.GITHUB_TOKEN }}"))
+    }
+
     named::job(
         release_job(&[])
             .runs_on(runners::LINUX_SMALL)
@@ -178,10 +189,9 @@ fn create_draft_release() -> NamedJob {
                     .add_with(("ref", "${{ github.ref }}")),
             )
             .add_step(steps::script("script/determine-release-channel")) // export RELEASE_CHANNEL and RELEASE_VERSION
-            .add_step(steps::script("mkdir -p target/")),
-        // todo(ci)
-        // .add_step(steps::script(r#"script/draft-release-notes "$RELEASE_VERSION" "$RELEASE_CHANNEL" > target/release-notes.md || true"#))
-        // .add_step(steps::script("script/create-draft-release target/release-notes.md")),
+            .add_step(steps::script("mkdir -p target/"))
+            .add_step(generate_release_notes())
+            .add_step(create_release()),
     )
 }