status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Trigger OSS => ENT merge for all release branches (#17853) 

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.
This commit is contained in:
Nathan Coleman 2023-06-23 14:14:55 -04:00 committed by GitHub
parent f16c5d87ab
commit 1f636715d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/oss-merge-trigger.yml vendored
View File

@ -8,7 +8,7 @@ on:
- closed - closed
branches: branches:
- main - main
- 'release/*.*.x' - release/**
jobs: jobs:
trigger-oss-merge: trigger-oss-merge:
@ -26,4 +26,4 @@ jobs:
curl -H "Authorization: token $GH_PAT" \ curl -H "Authorization: token $GH_PAT" \
-H 'Accept: application/json' \ -H 'Accept: application/json' \
-d "{\"event_type\": \"oss-merge\", \"client_payload\": {\"git-ref\": \"${GIT_REF}\", \"git-sha\": \"${GIT_SHA}\", \"git-actor\": \"${GIT_ACTOR}\" }}" \ -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"