Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Prioritize buildkite merge queue based on pr queue #5979

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

Draft
Aaron1011 wants to merge 1 commit into
base: main
Choose a base branch
from
+40 −1
Draft

Prioritize buildkite merge queue based on pr queue #5979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
agents:
queue: "t0-merge-queue"

# Priority based on merge queue position (negative so earlier positions have higher priority)
# Set via MERGE_QUEUE_PRIORITY env var from GitHub Actions
priority: ${MERGE_QUEUE_PRIORITY:-0}

# We need to use individual steps instead of a build matrix, as we can't use matrix keys
# inside concurrency_group
steps:
Expand Down
37 changes: 36 additions & 1 deletion .github/workflows/buildkite-merge-queue.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,50 @@ on:
# merge_group:
workflow_dispatch:

permissions: {}
permissions:
contents: read

jobs:
merge-queue-tests:
runs-on: ubuntu-latest
if: github.repository == 'tensorzero/tensorzero'
steps:
- name: Get merge queue position
id: get-position
env:
GH_TOKEN: ${{ github.token }}
run: |
# Extract PR number from merge queue branch name (format: gh-readonly-queue/main/pr-<NUMBER>-<SHA>)
PR_NUMBER=$(echo "${{ github.ref_name }}" | sed -n 's/.*\/pr-\([0-9]*\)-.*/\1/p')

if [ -z "$PR_NUMBER" ]; then
echo "Could not extract PR number from ref: ${{ github.ref_name }}"
echo "priority=0" >> "$GITHUB_OUTPUT"
exit 0
fi

# Query GitHub GraphQL API for merge queue position
POSITION=$(gh api graphql -f query='
query($owner: String!, $name: String!, $number: Int!) {
repository(owner: $owner, name: $name) {
pullRequest(number: $number) {
mergeQueueEntry {
position
}
}
}
}
' -f owner="${{ github.repository_owner }}" -f name="${{ github.event.repository.name }}" -F number="$PR_NUMBER" \
--jq '.data.repository.pullRequest.mergeQueueEntry.position // 0')

# Set priority to negative of position (so lower positions have higher priority)
PRIORITY=$((-POSITION))
echo "PR #$PR_NUMBER is at merge queue position $POSITION, setting priority to $PRIORITY"
echo "priority=$PRIORITY" >> "$GITHUB_OUTPUT"

- name: Trigger a Buildkite Build on Push using v2.0.0
uses: buildkite/[email protected]
with:
buildkite_api_access_token: ${{ secrets.TRIGGER_BK_BUILD_TOKEN }}
pipeline: "tensorzero/merge-queue-tests"
build_env_vars: '{"MERGE_QUEUE_PRIORITY": "${{ steps.get-position.outputs.priority }}"}'
Loading