From e4905c42f1213e1b601d7032e363f633d8df0180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kr=C3=A6n=20Hansen?= <kraen.hansen@mongodb.com>
Date: Wed, 27 Mar 2024 09:13:41 +0100
Subject: [PATCH] Moving checkout after publish of GitHub Release to enable
 reading ./RELEASEMOTES.md

---
 .github/workflows/publish-release.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 5d40fd6e..3c36e84b 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -363,13 +363,6 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           number: ${{ steps.find-pull-request.outputs.number }}
           method: squash
-
-      - name: Checkout base branch (after merge)
-        uses: actions/checkout@v3
-        if: ${{ inputs.dry_run == false }}
-        with:
-          submodules: recursive
-          ref: ${{ steps.find-pull-request.outputs.base-ref }}
           
       - name: Publish Github Release
         uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5
@@ -377,6 +370,7 @@ jobs:
         with:
           artifacts: "dist/*.exe,dist/*.dmg,dist/*.zip,dist/*.AppImage"
           bodyFile: ./RELEASENOTES.md
+          commit:  ${{ steps.find-pull-request.outputs.base-ref }}
           tag: v${{ env.PACKAGE_VERSION }}
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: false
@@ -392,6 +386,13 @@ jobs:
         # This job might fail due to failed markdown-to-slack conversion.
         continue-on-error: true
 
+      - name: Checkout base branch (after merge)
+        uses: actions/checkout@v3
+        if: ${{ inputs.dry_run == false }}
+        with:
+          submodules: recursive
+          ref: ${{ steps.find-pull-request.outputs.base-ref }}
+
       - name: Update Changelog
         run: |
           echo "## vNext (TBD)