Merge pull request #1222 from simonbaird/restore-release-branch-prefix

Bring back the release branch prefix
enterprise-contract · Dec 11, 2023 · 77c9bf2 · 77c9bf2
2 parents 8391657 + 1ddc271
commit 77c9bf2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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 <<EOT
 
 Next steps: