From 76302e0372c2f716c720dd2a4eafc967e4727483 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Tue, 11 Mar 2025 10:58:22 -0400 Subject: [PATCH] fix: merge main fetches with depth 0 --- .github/actions/merge-main/action.yml | 2 ++ .github/scripts/merge-main.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/merge-main/action.yml b/.github/actions/merge-main/action.yml index b73bff2..68fd143 100644 --- a/.github/actions/merge-main/action.yml +++ b/.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 diff --git a/.github/scripts/merge-main.sh b/.github/scripts/merge-main.sh index 61dd87d..f4f2587 100755 --- a/.github/scripts/merge-main.sh +++ b/.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"