From 05e0a9f31ea1e1dc766693a06b79b71901f68b02 Mon Sep 17 00:00:00 2001 From: pulimsr Date: Mon, 30 Mar 2026 14:14:39 -0400 Subject: [PATCH 1/5] Test comment for merge queue validation --- .github/workflows/pull-request-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml index a4a350abaa4e..c63deb2c1c08 100644 --- a/.github/workflows/pull-request-build.yml +++ b/.github/workflows/pull-request-build.yml @@ -1,4 +1,5 @@ name: Build SDK +# Test comment for merge queue PR on: pull_request: types: [ opened, synchronize, ready_for_review ] From a1c0948ef14329e403cf462082713a3e02a72957 Mon Sep 17 00:00:00 2001 From: pulimsr Date: Mon, 30 Mar 2026 16:15:35 -0400 Subject: [PATCH 2/5] Add merge_group trigger with skip optimization for first-in-queue --- .github/workflows/pull-request-build.yml | 29 ++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml index c63deb2c1c08..59c8b3e694fe 100644 --- a/.github/workflows/pull-request-build.yml +++ b/.github/workflows/pull-request-build.yml @@ -1,8 +1,8 @@ name: Build SDK -# Test comment for merge queue PR on: pull_request: types: [ opened, synchronize, ready_for_review ] + merge_group: concurrency: group: start-pull-request-build-${{ github.ref }} @@ -16,7 +16,7 @@ env: jobs: aws-sdk-pr-build: - if: github.event.pull_request.draft == false + if: github.event.pull_request.draft == false || github.event_name == 'merge_group' runs-on: ubuntu-latest permissions: id-token: write @@ -24,7 +24,26 @@ jobs: pull-requests: write contents: read steps: + - name: Check if merge queue build is needed + if: github.event_name == 'merge_group' + id: queue-check + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + BASE_SHA="${{ github.event.merge_group.base_sha }}" + BASE_REF="${{ github.event.merge_group.base_ref }}" + # base_ref is in refs/heads/ format, strip prefix for API call + BRANCH_NAME="${BASE_REF#refs/heads/}" + TARGET_SHA=$(gh api repos/${{ github.repository }}/git/ref/heads/${BRANCH_NAME} --jq '.object.sha') + if [ "$BASE_SHA" == "$TARGET_SHA" ]; then + echo "skip=true" >> "$GITHUB_OUTPUT" + echo "First in queue — PR build already validated this combination, skipping." + else + echo "skip=false" >> "$GITHUB_OUTPUT" + echo "Not first in queue — merge group includes changes from other PRs, build needed." + fi - name: Configure AWS Credentials + if: steps.queue-check.outputs.skip != 'true' uses: aws-actions/configure-aws-credentials@main with: role-to-assume: ${{ env.IAM_ROLE_ARN }} @@ -33,15 +52,17 @@ jobs: aws-region: us-west-2 role-duration-seconds: 7200 - name: Download Build Script + if: steps.queue-check.outputs.skip != 'true' run: | aws s3 cp s3://aws-sdk-builds-github-assets-prod-us-west-2/$SCRIPT_LOCATION ./$DOWNLOAD_FOLDER/$SCRIPT_LOCATION --no-progress chmod +x ./$DOWNLOAD_FOLDER/$SCRIPT_LOCATION - name: Build + if: steps.queue-check.outputs.skip != 'true' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPO: ${{ github.repository }} - HEAD_REF: ${{ github.event.pull_request.head.ref }} - PR_NUMBER: ${{ github.event.pull_request.number }} + HEAD_REF: ${{ github.event.pull_request.head.ref || github.event.merge_group.head_ref }} + PR_NUMBER: ${{ github.event.pull_request.number || '0' }} RUN_ID: ${{ github.run_id }} run: | ./$DOWNLOAD_FOLDER/$SCRIPT_LOCATION \ From bbb3ed6fa496fca18914a5846d27fa0f50212fcc Mon Sep 17 00:00:00 2001 From: pulimsr Date: Mon, 30 Mar 2026 16:31:07 -0400 Subject: [PATCH 3/5] 1st PR on the queue --- .github/workflows/pull-request-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml index 59c8b3e694fe..33c160a84ac1 100644 --- a/.github/workflows/pull-request-build.yml +++ b/.github/workflows/pull-request-build.yml @@ -70,4 +70,5 @@ jobs: --branch "$HEAD_REF" \ --pr-number "$PR_NUMBER" \ --run-id "$RUN_ID" - timeout-minutes: 180 \ No newline at end of file + timeout-minutes: 180 +#PR-I \ No newline at end of file From 390ba69585e6564b8f820511865e2f679e4ce5d0 Mon Sep 17 00:00:00 2001 From: pulimsr Date: Mon, 30 Mar 2026 23:23:23 -0400 Subject: [PATCH 4/5] pr-1 --- .github/workflows/pull-request-build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml index 175025c02f3b..cda39faeedc1 100644 --- a/.github/workflows/pull-request-build.yml +++ b/.github/workflows/pull-request-build.yml @@ -71,5 +71,4 @@ jobs: --branch "$HEAD_REF" \ --pr-number "$PR_NUMBER" \ --run-id "$RUN_ID" - timeout-minutes: 180 -#PR-I \ No newline at end of file + timeout-minutes: 180 \ No newline at end of file From f0648e438b779e1fc373cd0ec2e34c104d2951aa Mon Sep 17 00:00:00 2001 From: pulimsr Date: Tue, 31 Mar 2026 15:24:15 -0400 Subject: [PATCH 5/5] pr-1 --- .github/workflows/clang-format.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 8b2195587c4b..1b2bbaa2b2da 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -83,4 +83,5 @@ jobs: cat formatted_differences.patch rm formatted_differences.patch exit 1 - fi \ No newline at end of file + fi +#PR-I \ No newline at end of file