Skip to content

Commit 14abef5

Browse files
committed
fix: stash in the proper location & add comment
1 parent 8a9afcd commit 14abef5

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

.github/workflows/update-release-branch.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,14 @@ jobs:
9191
shell: bash
9292
run: |
9393
echo "merging main @ $main_sha into release @ $release_sha";
94+
95+
# Getting rid of the changes caused by "Configure Gradle"
96+
git stash
97+
9498
git switch release;
9599
input_message=${{ inputs.commit_message }}
96100
message=${input_message:-"Merging main into release"}
97101
echo "message=$message"
98-
git stash
99102
git merge -m "$message" main;
100103
if [ "${{ env.DRY_RUN }}" == "true" ]; then
101104
echo "dry run, skipping push to remote";

0 commit comments

Comments
 (0)