mirror of
https://github.com/fleetdm/fleet
synced 2026-05-23 08:58:41 +00:00
Adding in cherry-pick into prepare branch and push (#18499)
This commit is contained in:
parent
a7f3505785
commit
d3b821cf47
1 changed files with 7 additions and 0 deletions
|
|
@ -855,6 +855,13 @@ if [[ "$failed" == "false" ]]; then
|
|||
echo "DRYRUN: Would have switched back to branch $target_patch_branch"
|
||||
fi
|
||||
|
||||
if [[ "$main_release" == "false" ]]; then
|
||||
# Cherry-pick from update-changelog-branch
|
||||
ch_commit=`git log -n 1 --pretty=format:"%H" $update_changelog_branch`
|
||||
git cherry-pick $ch_commit
|
||||
git push origin $target_patch_branch -f
|
||||
fi
|
||||
|
||||
# Check for QA issue
|
||||
create_qa_issue
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue