Skip to content

Commit

Permalink
Update release
Browse files Browse the repository at this point in the history
  • Loading branch information
JayaShakthi97 committed Oct 29, 2023
1 parent 532ca76 commit 482b6e1
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .github/workflows/scripts/release-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ merge_to_master() {
local releaseBranch="release-action-$GITHUB_RUN_NUMBER"

git checkout fix-release-workflow &&
git pull origin fix-release-workflow &&
git merge --no-ff "$releaseBranch" -m "[skip ci] Merge release branch $releaseBranch" &&
git push origin fix-release-workflow &&
echo "Merged $releaseBranch into master"
}

Expand All @@ -40,7 +42,7 @@ dummy_long_running_process() {
git add "$dummyFileName"
git commit -m "[skip ci] Add dummy file ($dummyFileName) during release process"
echo "Committed $dummyFileName to the branch."
git push --set-upstream origin fix-release-workflow
git push --set-upstream origin "$releaseBranch"
echo "Pushed the changes to the remote branch."
}

Expand Down

0 comments on commit 482b6e1

Please sign in to comment.