From 1ddc27122f4c84feab8ab838d5b8da593188d578 Mon Sep 17 00:00:00 2001 From: Simon Baird Date: Mon, 11 Dec 2023 16:16:55 -0500 Subject: [PATCH] Bring back the release branch prefix It makes it easier to the GitHub CI if there's a branch name prefix. Decide to make it "release-" instead of "redhat-" this time around. --- .github/workflows/checks.yaml | 4 ++-- hack/cut-release.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index 8c9025016..5ef9619bb 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -21,11 +21,11 @@ name: Checks pull_request: branches: - main - - redhat-* + - release-* push: branches: - main - - redhat-* + - release-* workflow_dispatch: permissions: diff --git a/hack/cut-release.sh b/hack/cut-release.sh index 45dfa23b9..d4cc164af 100755 --- a/hack/cut-release.sh +++ b/hack/cut-release.sh @@ -32,7 +32,7 @@ if [[ $RELEASE_NAME == "" ]]; then fi # Use release name as-is for the branch name -BRANCH_NAME="${RELEASE_NAME}" +BRANCH_NAME="release-${RELEASE_NAME}" # RHTAP disallows . chars in names so remove those RHTAP_APPLICATION_SUFFIX="${RELEASE_NAME/./}" @@ -50,7 +50,7 @@ echo RHTAP cli component name: $RHTAP_CLI_COMPONENT_NAME RHTAP_APPS_URL=https://console.redhat.com/preview/application-pipeline/workspaces/rhtap-contract/applications # Explain what needs to be done next -# (We could make this more automated this in future.) +# (We could make this more automated in future.) cat <