From 4cfdcd65bd320483816d60458b585a415f73b635 Mon Sep 17 00:00:00 2001
From: James Stone <james.stone@mongodb.com>
Date: Thu, 23 May 2024 15:22:05 -0700
Subject: [PATCH] GHA release script fixes (#7727)

---
 .github/workflows/make-release.yml    | 1 +
 .github/workflows/prepare-release.yml | 5 ++---
 tools/release-init.sh                 | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
index a10541693ae..50385d767a3 100644
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -51,6 +51,7 @@ jobs:
         draft: false
         base: ${{ github.base_ref }}
         labels: no-jira-ticket
+        add-paths: CHANGELOG.md
         commit-message: New changelog section to prepare for vNext
     - name: Merge Pull Request
       uses: juliangruber/merge-pull-request-action@9234b8714dda9a08f3d1df5b2a6a3abd7b695353 #! 1.3.1
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 1ea5dc03604..58824460474 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -18,7 +18,8 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
         with:
-          submodules: recursive
+          submodules: false
+          fetch-depth: 0 # include history and tags
       - name: Change Version
         run: tools/release-init.sh ${{ inputs.version }}
         shell: bash
@@ -32,8 +33,6 @@ jobs:
           labels: no-jira-ticket
           commit-message: Prepare for release ${{ inputs.version }}
           token: ${{ secrets.REALM_CI_PAT }}
-          delete-branch: true
-          base: ${{ github.ref }}
           add-paths: |
             dependencies.yml
             Package.swift
diff --git a/tools/release-init.sh b/tools/release-init.sh
index 8d09bfaae50..1fa2b5e5e04 100755
--- a/tools/release-init.sh
+++ b/tools/release-init.sh
@@ -50,8 +50,7 @@ sed -i.bak -e "1s/.*/$RELEASE_HEADER/" "${project_dir}/CHANGELOG.md" || exit 1
 sed -i.bak -e "/.*\[#????\](https.*/d" "${project_dir}/CHANGELOG.md"
 rm "${project_dir}/CHANGELOG.md.bak" || exit 1
 
-# on CI we use a shallow clone, so we may not have the tags yet
-git fetch --tags
+# assumes that tags and history have been fetched
 git log $(git describe --tags --abbrev=0)..HEAD --oneline --no-merges > changes-since-last-tag.txt
 echo changes since last tag are
 cat changes-since-last-tag.txt