From 0d4f118b2a15029d7099b469a4c6da514df4e7c9 Mon Sep 17 00:00:00 2001 From: Scott Suarez Date: Fri, 8 Dec 2023 16:01:50 -0800 Subject: [PATCH] Build and test provider off main/feature (#9566) --- .github/workflows/build-downstream.yml | 2 +- .github/workflows/downstreams.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-downstream.yml b/.github/workflows/build-downstream.yml index 32fe3e526d37..f8446388ee65 100644 --- a/.github/workflows/build-downstream.yml +++ b/.github/workflows/build-downstream.yml @@ -17,7 +17,7 @@ jobs: generate-repository: runs-on: ubuntu-22.04 env: - BASE_BRANCH: ${{ github.event.pull_request.base.ref || github.ref }} + BASE_BRANCH: ${{ github.event.pull_request.base.ref || github.ref_name }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Checkout Repository diff --git a/.github/workflows/downstreams.yml b/.github/workflows/downstreams.yml index 1c0114fbe324..98273ca7e18e 100644 --- a/.github/workflows/downstreams.yml +++ b/.github/workflows/downstreams.yml @@ -4,7 +4,8 @@ permissions: read-all on: push: branches: - - scott-test-* + - main + - 'FEATURE-BRANCH-*' concurrency: group: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || format('commit-{0}', github.sha) }}