fixup! meta: prepare release workflow for 3.x versions

transloadit · Aug 21, 2024 · c7a9b51 · c7a9b51
1 parent 5ca41d7
commit c7a9b51
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
@@ -16,6 +16,12 @@ jobs:
         uses: actions/checkout@v4
         with:
           branch: release-3.x
+      - name: Rebase
+        run: |
+          git fetch origin 3.x --depth=1
+          git config --global user.email "[email protected]"
+          git config --global user.name "GitHub Actions"
+          git rebase FETCH_HEAD
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run:
@@ -59,8 +65,6 @@ jobs:
           echo "This is a release candidate for the following packages:" >> commitMessage
           echo >> commitMessage
           jq -r 'map("- `"+.ident+"`: "+.oldVersion+" -> "+.newVersion) | join("\n") ' < releases.json >> commitMessage
-          git config --global user.email "[email protected]"
-          git config --global user.name "GitHub Actions"
           git commit -n --amend --file commitMessage
       - name: Open Pull Request
         id: pr_opening
@@ -70,7 +74,7 @@ jobs:
             -F base="$RELEASE_LINE_BRANCH" \
             -F head="release-candidate" \
             -F title="$(head -1 commitMessage)" \
-            -F body="$(git --no-pager show --color=never --unified=0 HEAD -- CHANGELOG.md | awk '{ if( substr($0,0,1) == "+" && $1 != "+##" && $1 != "+Released:" && $1 != "+++" ) { print substr($0,2) } }')" \
+            -F body="$(git --no-pager diff HEAD^ -- CHANGELOG.md | awk '{ if( substr($0,0,1) == "+" && $1 != "+##" && $1 != "+Released:" && $1 != "+++" ) { print substr($0,2) } }')" \
             --jq '.number | tostring | "pr_number="+.' >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}