diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index e2ffed6d..25e095be 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -2,6 +2,8 @@ name: build-pr on: pull_request: + branches-ignore: + - pre-release env: GOPROXY: https://proxy.golang.org/ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01e09066..f42ea4be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - pre-release permissions: actions: write diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e04fb3bf..995cd242 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,8 +13,12 @@ on: type: string branch: description: 'Branch' - type: string + required: true + type: choice default: main + options: + - main + - pre-release jobs: staging: @@ -30,7 +34,7 @@ jobs: BOB_GITHUB_TOKEN: ${{ secrets.BOB_GITHUB_TOKEN }} VERSION: ${{ github.event.inputs.version }} SHA: ${{ github.event.inputs.sha }} - BRANCH: main + BRANCH: ${{ github.event.inputs.branch }} ENVIRONMENT: staging run: | bob trigger-promotion \ @@ -58,7 +62,7 @@ jobs: BOB_GITHUB_TOKEN: ${{ secrets.BOB_GITHUB_TOKEN }} VERSION: ${{ github.event.inputs.version }} SHA: ${{ github.event.inputs.sha }} - BRANCH: main + BRANCH: ${{ github.event.inputs.branch }} ENVIRONMENT: production run: | bob trigger-promotion \ diff --git a/.release/ci.hcl b/.release/ci.hcl index c7253cc1..c1e18df2 100644 --- a/.release/ci.hcl +++ b/.release/ci.hcl @@ -13,7 +13,7 @@ project "terraform-ls" { github { organization = "hashicorp" repository = "terraform-ls" - release_branches = ["main"] + release_branches = ["main", "pre-release"] } }