diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 26804da9ea..8195b04300 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,15 +1,11 @@ name: Release to Production # Run this workflow every time a new commit is pushed to the master branch -# or when a workflow run from the Version Branch Update workflow completes. -# In either case, the branch used for the build will be master. +# or a version branch (e.g. version-4-0) on: push: - branches: [master] - workflow_run: - workflows: [Version Branch Update] - types: [completed] + branches: ['master', 'version-**'] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/version-branch-update.yaml b/.github/workflows/version-branch-update.yaml index 7ece01ff5a..0f6e95816b 100644 --- a/.github/workflows/version-branch-update.yaml +++ b/.github/workflows/version-branch-update.yaml @@ -3,7 +3,7 @@ name: Version Branch Update on: pull_request: branches: - - 'version-*' + - 'version-**' types: [opened, synchronize, reopened]