misc: merge from main

Author: aws-sdk-kotlin-ci

.github/actions/merge-main/action.yml

@@ -9,6 +9,8 @@ runs:
   steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
 
     - name: Set up Git
       shell: bash

.github/scripts/merge-main.sh

@@ -69,7 +69,7 @@ function merge_main() {
     echo "...switching to branch: $branch"
     git switch "$branch"
     echo "...merging main"
-    git merge -m "misc: merge from main" main
+    git merge -m "misc: merge from main" origin/main
     if [ $? -eq 0 ]; then
       echo "...pushing to origin"
       git push origin "$branch"