Skip to content

Commit a55b810

Browse files
committed
ci: use base commit instead of ref for rebase
1 parent 23d3cd0 commit a55b810

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

.github/workflows/tf-autosquash.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,10 @@ jobs:
9090
git fetch origin
9191
echo "Base ref commit:"
9292
git log -1 --oneline "origin/$BASE_REF"
93-
git rebase -i --autosquash "origin/$BASE_REF"
93+
BASE_COMMIT=$(git rev-parse "origin/$BASE_REF")
94+
echo "Base commit: $BASE_COMMIT"
95+
# git rebase -i --autosquash "origin/$BASE_REF"
96+
git rebase -i --autosquash $BASE_COMMIT
9497
9598
- name: Push changes
9699
run: |

0 commit comments

Comments
 (0)