Use release notes file

mafredri · mafredri · commit 73813839e9e0 · 2023-01-10T17:14:22.000Z
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -113,7 +113,7 @@ jobs:
 
       - name: Create release tag and release notes
         run: |
-          set -eu
+          set -euo pipefail
           ref=HEAD
           old_version="$(git describe --abbrev=0 "$ref^1")"
 
@@ -134,13 +134,14 @@ jobs:
           )"
 
           # Generate notes.
-          release_notes="$(./scripts/release/generate_release_notes.sh --old-version "$old_version" --new-version "$version" --ref "$ref")"
-          echo 'CODER_RELEASE_NOTES<<RN_EOF' >> $GITHUB_ENV
-          echo "$release_notes" >> $GITHUB_ENV
-          echo 'RN_EOF' >> $GITHUB_ENV
+          release_notes_file="$(mktemp -t release_notes.XXXXXX)"
+          ./scripts/release/generate_release_notes.sh --old-version "$old_version" --new-version "$version" --ref "$ref" >> "release_notes_file"
+          echo CODER_RELEASE_NOTES_FILE="$release_notes_file" >> $GITHUB_ENV
 
       - name: Echo release notes
-        run: echo "$CODER_RELEASE_NOTES"
+        run: |
+          set -euo pipefail
+          cat "$CODER_RELEASE_NOTES_FILE"
 
       - name: Build binaries
         run: |
@@ -199,10 +200,11 @@ jobs:
 
       - name: Publish release
         run: |
+          set -euo pipefail
           ./scripts/release/publish.sh \
             ${{ github.event.inputs.draft && '--draft' }} \
             ${{ (github.event.inputs.dry_run || github.event.inputs.snapshot) && '--dry-run' }} \
-            --release-notes "$CODER_RELEASE_NOTES" \
+            --release-notes-file "$CODER_RELEASE_NOTES_FILE" \
             ./build/*_installer.exe \
             ./build/*.zip \
             ./build/*.tar.gz \
diff --git a/scripts/release/publish.sh b/scripts/release/publish.sh
@@ -34,20 +34,20 @@ if [[ "${CI:-}" == "" ]]; then
 fi
 
 version=""
-release_notes=""
+release_notes_file=""
 draft=0
 dry_run=0
 
-args="$(getopt -o "" -l version:,release-notes:,draft,dry-run -- "$@")"
+args="$(getopt -o "" -l version:,release-notes-file:,draft,dry-run -- "$@")"
 eval set -- "$args"
 while true; do
 	case "$1" in
 	--version)
 		version="$2"
 		shift 2
 		;;
-	--release-notes)
-		release_notes="$2"
+	--release-notes-file)
+		release_notes_file="$2"
 		shift 2
 		;;
 	--draft)
@@ -110,9 +110,6 @@ if [[ "$(git describe --always)" != "$new_tag" ]]; then
 	log "The provided version does not match the current git tag, but --dry-run was supplied so continuing..."
 fi
 
-release_notes_file="$(mktemp)"
-echo "$release_notes" >"$release_notes_file"
-
 # Create temporary release folder so we can generate checksums. Both the
 # sha256sum and gh binaries support symlinks as input files so this works well.
 temp_dir="$(mktemp -d)"
@@ -128,7 +125,7 @@ popd
 log "--- Publishing release $new_tag on GitHub"
 log
 log "Description:"
-echo "$release_notes" | sed -e 's/^/\t/' - 1>&2
+sed -e 's/^/\t/' - <"$release_notes_file" 1>&2
 log
 log "Contents:"
 pushd "$temp_dir"
