try fix again

Ben Kunkle created 2 months ago

Change summary

.github/workflows/release.yml                | 15 +++++++++---
tooling/xtask/src/tasks/workflows/release.rs | 25 ++++++++++++++++-----
2 files changed, 30 insertions(+), 10 deletions(-)

Detailed changes

.github/workflows/release.yml

@@ -159,11 +159,18 @@ jobs:
     - name: mkdir -p target/
       run: mkdir -p target/
       shell: bash -euxo pipefail {0}
-    - name: script/draft-release-notes "0.211.1" "preview" > target/release-notes.md || true
-      run: script/draft-release-notes "0.211.1" "preview" > target/release-notes.md || true
+    - name: |
+        echo "RELEASE_CHANNEL=preview" >> $GITHUB_ENV
+        echo "RELEASE_VERSION=0.211.1 >> $GITHUB_ENV
+      run: |
+        echo "RELEASE_CHANNEL=preview" >> $GITHUB_ENV
+        echo "RELEASE_VERSION=0.211.1 >> $GITHUB_ENV
+      shell: bash -euxo pipefail {0}
+    - name: release::create_draft_release::draft_release_notes
+      run: node --redirect-warnings=/dev/null ./script/draft-release-notes $RELEASE_CHANNEL $RELEASE_VERSION > target/release-notes.md
       shell: bash -euxo pipefail {0}
-    - name: script/create-draft-release target/release-notes.md
-      run: script/create-draft-release target/release-notes.md
+    - name: release::create_draft_release::create_draft_release
+      run: script/create-draft-releae target/release-notes.md
       shell: bash -euxo pipefail {0}
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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 draft_release_notes() -> Step<Run> {
+        named::bash(
+            "node --redirect-warnings=/dev/null ./script/draft-release-notes $RELEASE_CHANNEL $RELEASE_VERSION > target/release-notes.md",
+        )
+    }
+
+    fn create_draft_release() -> Step<Run> {
+        named::bash("script/create-draft-releae target/release-notes.md")
+            .add_env(("GITHUB_TOKEN", "${{ secrets.GITHUB_TOKEN }}"))
+    }
+
     named::job(
         release_job(&[])
             .runs_on(runners::LINUX_SMALL)
@@ -178,12 +189,14 @@ fn create_draft_release() -> NamedJob {
                     .add_with(("ref", "${{ github.ref }}")),
             )
             // todo!()
-            // .add_step(steps::script("script/determine-release-channel")) // export RELEASE_CHANNEL and RELEASE_VERSION
-        .add_step(steps::script("mkdir -p target/"))
-        .add_step(steps::script(r#"script/draft-release-notes "0.211.1" "preview" > target/release-notes.md || true"#))
-        .add_step(steps::script("script/create-draft-release target/release-notes.md")
-            .add_env(("GITHUB_TOKEN", "${{ secrets.GITHUB_TOKEN }}"))
-        )
+            // .add_step(steps::script("script/determine-release-channel"))
+            .add_step(steps::script("mkdir -p target/"))
+            .add_step(steps::script(indoc::indoc! {r#"
+                echo "RELEASE_CHANNEL=preview" >> $GITHUB_ENV
+                echo "RELEASE_VERSION=0.211.1 >> $GITHUB_ENV
+            "#}))
+            .add_step(draft_release_notes())
+            .add_step(create_draft_release()),
     )
 }