Fixes to release process after migration (#12)

Signed-off-by: Mykhailo Kuznietsov <mkuznets@redhat.com>
pull/13/head
Mykhailo Kuznietsov 2021-05-26 18:30:11 +03:00 committed by GitHub
parent 2e83d831d3
commit cb51d783d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -147,7 +147,7 @@ jobs:
- name: Create failure MM message
if: ${{ failure() }}
run: |
echo "{\"text\":\":no_entry_sign: Che Server ${{ github.event.inputs.version }} release has failed: https://github.com/eclipse/che/actions/workflows/release.yml\"}" > mattermost.json
echo "{\"text\":\":no_entry_sign: Che Server ${{ github.event.inputs.version }} release has failed: https://github.com/eclipse-che/che-server/actions/workflows/release.yml\"}" > mattermost.json
- name: Create success MM message
run: |
echo "{\"text\":\":white_check_mark: Che Server ${{ github.event.inputs.version }} has been released: https://quay.io/eclipse/che-server:${{ github.event.inputs.version }}\"}" > mattermost.json

View File

@ -67,7 +67,7 @@ evaluateCheVariables() {
echo "Branch: ${BRANCH}"
if [[ ${CHE_VERSION} == *".0" ]]; then
BASEBRANCH="master"
BASEBRANCH="main"
else
BASEBRANCH="${BRANCH}"
fi
@ -80,7 +80,7 @@ checkoutProjects() {
if [[ ${RELEASE_CHE_PARENT} = "true" ]]; then
checkoutProject git@github.com:eclipse/che-parent
fi
checkoutProject git@github.com:eclipse/che
checkoutProject git@github.com:eclipse-che/che-server
}
checkoutProject() {
@ -155,7 +155,7 @@ commitChangeOrCreatePR() {
PUSH_TRY="$(git push origin "${aBRANCH}")"
# shellcheck disable=SC2181
if [[ $? -gt 0 ]] || [[ $PUSH_TRY == *"protected branch hook declined"* ]]; then
# create pull request for master branch, as branch is restricted
# create pull request for main branch, as branch is restricted
git branch "${PR_BRANCH}"
git checkout "${PR_BRANCH}"
git pull origin "${PR_BRANCH}"