From 5c785ab41b2eac59c5b343e7c53b278b1a77328f Mon Sep 17 00:00:00 2001
From: Felipe Suero <felipesu19@github.com>
Date: Tue, 2 May 2023 13:05:17 -0400
Subject: [PATCH] merge main in, port changes

---
 .github/workflows/publish.yml              |  4 ++--
 script/workflows/generate-release-notes.sh | 15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 600560b..f61af0a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -52,10 +52,10 @@ jobs:
       - name: Create PR
         run: |
           LAST_PR=$(gh pr list --repo ${{ github.repository }} --limit 1 --state merged --search "Release version" --json number | jq -r '.[0].number')
-          RELEASE_NOTES=$(./scripts/workflows/release-notes.sh $LAST_PR ${{ env.new_version }})
+          ./script/workflows/generate-release-notes.sh $LAST_PR ${{ env.new_version }}
           gh pr create \
             --title "Release version ${{ env.new_version }}" \
-            --body "Release version ${{ env.new_version }}" \
+            --body-file releasenotes.md \
             --base main \
             --head release/${{ env.new_version }}
         env:
diff --git a/script/workflows/generate-release-notes.sh b/script/workflows/generate-release-notes.sh
index d9e7ff3..958168d 100755
--- a/script/workflows/generate-release-notes.sh
+++ b/script/workflows/generate-release-notes.sh
@@ -15,17 +15,16 @@ LAST_RELEASE_PR=$1
 NEW_RELEASE=$2
 
 #get when the last release was merged
-LAST_RELEASE_MERGED_AT=$(gh pr view $LAST_RELEASE_PR --repo actions/languageservices --json mergedAt  | jq -r '.mergedAt')
+LAST_RELEASE_MERGED_AT=$(gh pr view $LAST_RELEASE_PR --repo github/vscode-github-actions --json mergedAt  | jq -r '.mergedAt')
 
-CHANGELIST=$(gh pr list --repo actions/languageservices --base main --state merged --json title --search "merged:>$LAST_RELEASE_MERGED_AT -label:no-release")
+CHANGELIST=$(gh pr list --repo github/vscode-github-actions --base main --state merged --json title --search "merged:>$LAST_RELEASE_MERGED_AT -label:no-release")
 
 # store the release notes in a variable so we can use it later
 
-RELEASE_NOTES="Release $NEW_RELEASE"
+echo "Release $NEW_RELEASE" >> releasenotes.md
 
-UPDATED=$(echo $CHANGELIST | jq -r '.[].title' | while read line; do
-  echo " - $line \n";
-done)
+echo $CHANGELIST | jq -r '.[].title' | while read line; do
+  echo " - $line" >> releasenotes.md
+done
 
-RELEASE_NOTES="$RELEASE_NOTES\n$UPDATED"
-echo $RELEASE_NOTES
+echo " "
\ No newline at end of file