From 6e6a78f966ca5d6fbf0f27211edfafbe82f2902b Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Thu, 9 Sep 2021 11:05:07 +0300 Subject: [PATCH] fix: release process (#1059) * fix: Exclude Dockerfile from copying to main branch on release Signed-off-by: Anatolii Bazko * Use stable channel to test in release PR Signed-off-by: Anatolii Bazko --- .github/bin/minikube/test-olm.sh | 2 +- make-release.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/bin/minikube/test-olm.sh b/.github/bin/minikube/test-olm.sh index 357d5d911..eb904de33 100755 --- a/.github/bin/minikube/test-olm.sh +++ b/.github/bin/minikube/test-olm.sh @@ -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 diff --git a/make-release.sh b/make-release.sh index 4e1067fdc..6707a7965 100755 --- a/make-release.sh +++ b/make-release.sh @@ -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