Skip to content

chore: make release script create PRs for protected branches #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mkuznyetsov wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −17
Open

chore: make release script create PRs for protected branches #351

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 31 additions & 17 deletions make-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,35 @@ releaseMachineExec() {
echo "Pushed ${REGISTRY}/${ORGANIZATION}/${IMAGE}:${VERSION}"
}

commitChangeOrCreatePR()
{
if [[ ${NOCOMMIT} -eq 1 ]]; then
echo "[INFO] NOCOMMIT = 1; so nothing will be committed. Run this script with no flags for usage + list of flags/options."
else
aVERSION="$1"
aBRANCH="$2"
PR_BRANCH="$3"

COMMIT_MSG="chore: release: bump to ${aVERSION} in ${aBRANCH}"

# commit change into branch
git add -A || true
git commit -s -m "${COMMIT_MSG}"
git pull origin "${aBRANCH}"

PUSH_TRY="$(git push origin "${aBRANCH}")"
# shellcheck disable=SC2181
if [[ $? -gt 0 ]] || [[ $PUSH_TRY == *"protected branch hook declined"* ]]; then
# create pull request for main branch, as branch is restricted
git branch "${PR_BRANCH}"
git checkout "${PR_BRANCH}"
git pull origin "${PR_BRANCH}"
git push origin "${PR_BRANCH}"
gh pr create -f -B "${aBRANCH}" -H "${PR_BRANCH}"
fi
fi
}

# derive branch from version
BRANCH=${VERSION%.*}.x

Expand Down Expand Up @@ -85,6 +114,7 @@ if [[ ${NOCOMMIT} -eq 0 ]]; then
git commit -s -m "${COMMIT_MSG}" VERSION
git pull origin "${BRANCH}"
git push origin "${BRANCH}"
commitChangeOrCreatePR "${VERSION}" "${BRANCH}" "pr-${BRANCH}-to-${NEXTVERSION}"
fi

if [[ $TRIGGER_RELEASE -eq 1 ]]; then
Expand Down Expand Up @@ -115,21 +145,5 @@ fi
# change VERSION file
echo "${NEXTVERSION}" > VERSION
if [[ ${NOCOMMIT} -eq 0 ]]; then
BRANCH=${BASEBRANCH}
# commit change into branch
COMMIT_MSG="chore: release: bump to ${NEXTVERSION} in ${BRANCH}"
git commit -s -m "${COMMIT_MSG}" VERSION
git pull origin "${BRANCH}"

PUSH_TRY="$(git push origin "${BRANCH}")"
# shellcheck disable=SC2181
if [[ $? -gt 0 ]] || [[ $PUSH_TRY == *"protected branch hook declined"* ]]; then
PR_BRANCH=pr-main-to-${NEXTVERSION}
# create pull request for main branch, as branch is restricted
git branch "${PR_BRANCH}"
git checkout "${PR_BRANCH}"
git pull origin "${PR_BRANCH}"
git push origin "${PR_BRANCH}"
gh pr create -f -B "${BRANCH}" -H "${PR_BRANCH}"
fi
commitChangeOrCreatePR "$NEXTVERSION" "$BASEBRANCH" pr-main-to-${NEXTVERSION}
fi
Loading