fix: release process (#1059)

* fix: Exclude Dockerfile from copying to main branch on release

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

* Use stable channel to test in release PR

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
pull/1061/head
Anatolii Bazko 2021-09-09 11:05:07 +03:00 committed by GitHub
parent 007dc2751b
commit 6e6a78f966
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -25,7 +25,7 @@ trap "catchFinish" EXIT SIGINT
runTest() {
local channel=next
if [[ $(git rev-parse --abbrev-ref HEAD) =~ release$ ]]; then
if [[ $GITHUB_HEAD_REF =~ release$ ]]; then
channel=stable
fi

View File

@ -285,7 +285,7 @@ createPRToMainBranch() {
resetChanges main
local tmpBranch="copy-csv-to-main"
git checkout -B $tmpBranch
git diff refs/heads/${BRANCH}...refs/heads/${RELEASE_BRANCH} ':(exclude)config/manager/manager.yaml' | git apply -3
git diff refs/heads/${BRANCH}...refs/heads/${RELEASE_BRANCH} ':(exclude)config/manager/manager.yaml' ':(exclude)Dockerfile' | git apply -3
if git status --porcelain; then
git add -A || true # add new generated CSV files in olm/ folder
git commit -am "ci: Copy "$RELEASE" csv to main" --signoff