Skip to content

chore: passed the pr details to the sync job as part of repository dispatch event #22693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 5, 2025
+30 −6
Merged

chore: passed the pr details to the sync job as part of repository dispatch event #22693

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e9f6c9
chore: passed the pr details to the sync job as part of repository di…
hc-github-team-consul-core Sep 4, 2025
a6d899d
chore: passed the pr details to the sync job as part of repository di…
hc-github-team-consul-core Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 30 additions & 6 deletions .github/workflows/ce-merge-trigger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ on:
branches:
- main
- release/**
- '!release/1.18**'
- '!release/1.17**'
- '!release/1.16**'
- '!release/1.15**'


jobs:
Expand All @@ -21,15 +17,43 @@ jobs:
if: ${{ github.event.pull_request.merged && github.repository == 'hashicorp/consul' }}
runs-on: ubuntu-latest
steps:
- name: Fetch active releases
id: active
run: |
ACTIVE=$(grep -A 2 'ce_active = true' .release/versions.hcl | grep 'version "' | grep -o '[0-9]\+\.[0-9]\+')
echo "Active versions: $ACTIVE"
BRANCH="${{ github.ref_name }}"
IS_ACTIVE=0
for v in $ACTIVE; do
if [[ "$BRANCH" == "release/$v"* ]]; then IS_ACTIVE=1; fi
done
if [[ "$BRANCH" == "main" ]]; then IS_ACTIVE=1; fi
echo "active=$IS_ACTIVE" >> $GITHUB_OUTPUT
- name: Get Approving Reviewers
id: reviewers
continue-on-error: true
env:
GH_PAT: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
PR_NUMBER: ${{ github.event.pull_request.number }}
REPO: ${{ github.repository }}
run: |
reviewers=$(curl -s -H "Authorization: token $GH_PAT" \
"https://api.github.com/repos/$REPO/pulls/$PR_NUMBER/reviews" | \
jq -r '[.[] | select(.state=="APPROVED") | .user.login] | unique | @json')
echo "approved_reviewers=$reviewers" >> $GITHUB_OUTPUT
echo "Approved reviewers: $reviewers"
- name: Trigger Merge
if: steps.active.outputs.active == '1'
env:
GIT_REF: ${{ github.ref_name }}
GIT_SHA: ${{ github.sha }}
GH_PAT: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
GIT_ACTOR: ${{ github.actor }}
# TODO(spatel): CE refactor
PR_TITLE: ${{ github.event.pull_request.title }}
PR_BODY: ${{ github.event.pull_request.body }}
PR_APPROVERS: ${{ steps.reviewers.outputs.approved_reviewers }}
run: |
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}\" }}" \
-d "{\"event_type\": \"oss-merge\", \"client_payload\": {\"git-ref\": \"${GIT_REF}\", \"git-sha\": \"${GIT_SHA}\", \"git-actor\": \"${GIT_ACTOR}\", \"title\": \"${PR_TITLE}\", \"description\": \"${PR_BODY}\", \"pr_approvers\": ${PR_APPROVERS} }}" \
"https://api.github.com/repos/hashicorp/consul-enterprise/dispatches"
Loading