fix: merging changes to master on full release

!75 nofusscomputing/projects/ansible/collections/ci-test!14
This commit is contained in:
2024-02-17 12:42:27 +09:30
parent fe1fc844d5
commit 5eb34f87e5

View File

@ -307,8 +307,14 @@ variables:
if [ $CI_COMMIT_BRANCH == "master" ]; then
git merge --no-ff master;
git push --all;
echo "Trace Checkout master branch";
git checkout master;
echo "Trace merge changes from development branch";
git merge --no-ff development;
echo "Trace push changes to origin";
git push origin master;
fi;