Skip to content

Commit 76302e0

Browse files
committed
fix: merge main fetches with depth 0
1 parent 330d095 commit 76302e0

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ runs:
99
steps:
1010
- name: Checkout repository
1111
uses: actions/checkout@v4
12+
with:
13+
fetch-depth: 0
1214

1315
- name: Set up Git
1416
shell: bash

.github/scripts/merge-main.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function merge_main() {
6969
echo "...switching to branch: $branch"
7070
git switch "$branch"
7171
echo "...merging main"
72-
git merge -m "misc: merge from main" main
72+
git merge -m "misc: merge from main" origin/main
7373
if [ $? -eq 0 ]; then
7474
echo "...pushing to origin"
7575
git push origin "$branch"

0 commit comments

Comments
 (0)