Merge pull request #425 from OpenVoxProject/main-prep-for-8.x

Changes to prepare for 8.x branching

Author: nmburgan

.github/workflows/build.yml

@@ -33,6 +33,13 @@ on:
         required: false
         type: boolean
         default: false
+      branch:
+        description: 'The release branch to build from.'
+        type: choice
+        options:
+          - main
+          - '8.x'
+        default: 'main'
 
 jobs:
   build:
@@ -45,6 +52,7 @@ jobs:
       vanagon_branch: ${{ inputs.vanagon_branch }}
       upload_to_s3: ${{ inputs.upload_to_s3 }}
       working_directory: 'packaging'
+      branch: ${{ inputs.branch }}
     secrets: inherit
   build_dev:
     if: ${{ github.event.inputs.use_dev == 'true' }}
@@ -56,4 +64,5 @@ jobs:
       vanagon_branch: ${{ inputs.vanagon_branch }}
       upload_to_s3: ${{ inputs.upload_to_s3 }}
       working_directory: 'packaging'
+      branch: ${{ inputs.branch }}
     secrets: inherit

.github/workflows/prepare_release.yml

@@ -8,10 +8,12 @@ on:
         required: true
         type: string
       base-branch:
-        description: 'The branch that will be used as the origin for the release branch.'
-        required: false
-        default: ''
-        type: string
+        description: 'The branch to release from.'
+        type: choice
+        options:
+          - main
+          - '8.x'
+        default: 'main'
 
 permissions: {}
 

.github/workflows/release.yml

@@ -8,10 +8,12 @@ on:
         required: true
         type: string
       base-branch:
-        description: 'The branch where we do this release.'
-        required: false
-        default: ''
-        type: string
+        description: 'The branch to release from.'
+        type: choice
+        options:
+          - main
+          - '8.x'
+        default: 'main'
 
 permissions: {}
 

.github/workflows/tests.yaml

@@ -2,7 +2,7 @@
 name: RSpec tests
 
 on:
-  pull_request: {}
+  pull_request: { branches: ['main'] }
   push:
     branches:
       - main