Skip to content

Commit

Permalink
Trigger OSS => ENT merge for all release branches (#17853)
Browse files Browse the repository at this point in the history
Previously, this only triggered for release/*.*.x branches; however, our release process involves cutting a release/1.16.0 branch, for example, at time of code freeze these days. Any PRs to that branch after code freeze today do not make their way to consul-enterprise. This will make behavior for a .0 branch consistent with current behavior for a .x branch.
  • Loading branch information
nathancoleman committed Jun 23, 2023
1 parent f16c5d8 commit 1f63671
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/oss-merge-trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- closed
branches:
- main
- 'release/*.*.x'
- release/**

jobs:
trigger-oss-merge:
Expand All @@ -26,4 +26,4 @@ jobs:
curl -H "Authorization: token $GH_PAT" \
-H 'Accept: application/json' \
-d "{\"event_type\": \"oss-merge\", \"client_payload\": {\"git-ref\": \"${GIT_REF}\", \"git-sha\": \"${GIT_SHA}\", \"git-actor\": \"${GIT_ACTOR}\" }}" \
"https://api.github.com/repos/hashicorp/consul-enterprise/dispatches"
"https://api.github.com/repos/hashicorp/consul-enterprise/dispatches"

0 comments on commit 1f63671

Please sign in to comment.