From 593f7becd66a8c0041fbe098b729bb619de17908 Mon Sep 17 00:00:00 2001 From: Alex Wang Date: Tue, 6 Oct 2026 23:43:32 +0000 Subject: [PATCH 1/2] ci: run shared workflows on the CodeBuild runner Bump the aws-durable-execution-ci and conformance-tests orchestrator pins to the commits that accept a runner input, and pass the CodeBuild runner label from every thin shell. --- .github/workflows/ai-issue-implementation.yml | 4 +++- .github/workflows/ai-pr-review-address-continuation.yml | 4 +++- .github/workflows/ai-pr-review-address.yml | 6 ++++-- .github/workflows/ai-pr-review.yml | 5 ++++- .github/workflows/issue-triage.yml | 6 +++++- .github/workflows/notify.yml | 6 +++++- .github/workflows/otel-conformance-tests.yml | 5 ++++- .github/workflows/stale-issue-closer.yml | 6 +++++- 8 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ai-issue-implementation.yml b/.github/workflows/ai-issue-implementation.yml index f607dff03a..bd545a3c82 100644 --- a/.github/workflows/ai-issue-implementation.yml +++ b/.github/workflows/ai-issue-implementation.yml @@ -12,6 +12,8 @@ on: permissions: {} +# Stays on GitHub-hosted runners: the reusable workflow's codex-issue-worker job +# allows 140 minutes and the CodeBuild project's job limit is 60. jobs: implement: permissions: @@ -19,7 +21,7 @@ jobs: id-token: write issues: write pull-requests: write - uses: aws/aws-durable-execution-ci/.github/workflows/ai-issue-implementation.yml@d6b017da14385908951d23e26c790b28a4e5f9f0 + uses: aws/aws-durable-execution-ci/.github/workflows/ai-issue-implementation.yml@d901b2f1a50731f46bb791b7cae6cbe7f56ae917 with: issue-number: ${{ inputs['issue-number'] || '' }} secrets: inherit diff --git a/.github/workflows/ai-pr-review-address-continuation.yml b/.github/workflows/ai-pr-review-address-continuation.yml index 1ef7917de3..d711c12bd9 100644 --- a/.github/workflows/ai-pr-review-address-continuation.yml +++ b/.github/workflows/ai-pr-review-address-continuation.yml @@ -8,6 +8,8 @@ on: permissions: {} +# Stays on GitHub-hosted runners: the reusable workflow's codex-issue-worker job +# allows 140 minutes and the CodeBuild project's job limit is 60. jobs: address: if: >- @@ -20,7 +22,7 @@ jobs: id-token: write issues: write pull-requests: write - uses: aws/aws-durable-execution-ci/.github/workflows/ai-pr-review-address.yml@d6b017da14385908951d23e26c790b28a4e5f9f0 + uses: aws/aws-durable-execution-ci/.github/workflows/ai-pr-review-address.yml@d901b2f1a50731f46bb791b7cae6cbe7f56ae917 with: source-run-id: >- ${{ format('{0}', github.event.workflow_run.id || '') }} diff --git a/.github/workflows/ai-pr-review-address.yml b/.github/workflows/ai-pr-review-address.yml index 2b6e25d79d..49d936190b 100644 --- a/.github/workflows/ai-pr-review-address.yml +++ b/.github/workflows/ai-pr-review-address.yml @@ -16,6 +16,8 @@ on: permissions: {} +# Stays on GitHub-hosted runners: the reusable workflow's codex-issue-worker job +# allows 140 minutes and the CodeBuild project's job limit is 60. jobs: intake: if: github.event_name == 'pull_request_review_comment' @@ -23,7 +25,7 @@ jobs: contents: read issues: read pull-requests: read - uses: aws/aws-durable-execution-ci/.github/workflows/ai-pr-review-address.yml@d6b017da14385908951d23e26c790b28a4e5f9f0 + uses: aws/aws-durable-execution-ci/.github/workflows/ai-pr-review-address.yml@d901b2f1a50731f46bb791b7cae6cbe7f56ae917 address: if: >- @@ -35,7 +37,7 @@ jobs: id-token: write issues: write pull-requests: write - uses: aws/aws-durable-execution-ci/.github/workflows/ai-pr-review-address.yml@d6b017da14385908951d23e26c790b28a4e5f9f0 + uses: aws/aws-durable-execution-ci/.github/workflows/ai-pr-review-address.yml@d901b2f1a50731f46bb791b7cae6cbe7f56ae917 with: pull-request-number: ${{ inputs['pull-request-number'] || '' }} secrets: inherit diff --git a/.github/workflows/ai-pr-review.yml b/.github/workflows/ai-pr-review.yml index 94ff842c71..3a9e3e767c 100644 --- a/.github/workflows/ai-pr-review.yml +++ b/.github/workflows/ai-pr-review.yml @@ -18,8 +18,11 @@ jobs: contents: write id-token: write pull-requests: write - uses: aws/aws-durable-execution-ci/.github/workflows/ai-pr-review.yml@d6b017da14385908951d23e26c790b28a4e5f9f0 + uses: aws/aws-durable-execution-ci/.github/workflows/ai-pr-review.yml@d901b2f1a50731f46bb791b7cae6cbe7f56ae917 with: + # CodeBuild-hosted runner in the Java testing account; the label must + # match the CodeBuild project name. + runs-on: codebuild-github-actions-runner-${{ github.run_id }}-${{ github.run_attempt }} prompt-path: .github/prompts/ai-pr-review.md run-claude: false secrets: inherit diff --git a/.github/workflows/issue-triage.yml b/.github/workflows/issue-triage.yml index 0a07ad1c2f..5c7c0b5e1c 100644 --- a/.github/workflows/issue-triage.yml +++ b/.github/workflows/issue-triage.yml @@ -12,5 +12,9 @@ jobs: contents: read id-token: write issues: write - uses: aws/aws-durable-execution-ci/.github/workflows/issue-triage.yml@d6b017da14385908951d23e26c790b28a4e5f9f0 + uses: aws/aws-durable-execution-ci/.github/workflows/issue-triage.yml@d901b2f1a50731f46bb791b7cae6cbe7f56ae917 + with: + # CodeBuild-hosted runner in the Java testing account; the label must + # match the CodeBuild project name. + runs-on: codebuild-github-actions-runner-${{ github.run_id }}-${{ github.run_attempt }} secrets: inherit diff --git a/.github/workflows/notify.yml b/.github/workflows/notify.yml index eaf1b44074..bbd6f52f36 100644 --- a/.github/workflows/notify.yml +++ b/.github/workflows/notify.yml @@ -17,7 +17,11 @@ jobs: permissions: contents: read id-token: write - uses: aws/aws-durable-execution-ci/.github/workflows/notify.yml@d6b017da14385908951d23e26c790b28a4e5f9f0 + uses: aws/aws-durable-execution-ci/.github/workflows/notify.yml@d901b2f1a50731f46bb791b7cae6cbe7f56ae917 + with: + # CodeBuild-hosted runner in the Java testing account; the label must + # match the CodeBuild project name. + runs-on: codebuild-github-actions-runner-${{ github.run_id }}-${{ github.run_attempt }} secrets: BEDROCK_ROLE_ARN: ${{ secrets.BEDROCK_ROLE_ARN }} SLACK_WEBHOOK_URL_PR: ${{ secrets.SLACK_WEBHOOK_URL_PR }} diff --git a/.github/workflows/otel-conformance-tests.yml b/.github/workflows/otel-conformance-tests.yml index 68b3bc3f2b..ce63cec01a 100644 --- a/.github/workflows/otel-conformance-tests.yml +++ b/.github/workflows/otel-conformance-tests.yml @@ -62,8 +62,11 @@ jobs: actions: write contents: read id-token: write - uses: aws/aws-durable-execution-conformance-tests/.github/workflows/opentelemetry-orchestrator.yml@43872f8d5dd917fe3ee6d01a6c953c1ff67c5fe4 + uses: aws/aws-durable-execution-conformance-tests/.github/workflows/opentelemetry-orchestrator.yml@3542852f918f515d7c6a53af1eb0d5aa83d1eb1e with: + # CodeBuild-hosted runner in the Java testing account; the label must + # match the CodeBuild project name. + runs_on: codebuild-github-actions-runner-${{ github.run_id }}-${{ github.run_attempt }} language: java resource_prefix: j sdk_repository: aws/aws-durable-execution-sdk-java diff --git a/.github/workflows/stale-issue-closer.yml b/.github/workflows/stale-issue-closer.yml index 9fb2b64dcc..523c854990 100644 --- a/.github/workflows/stale-issue-closer.yml +++ b/.github/workflows/stale-issue-closer.yml @@ -14,4 +14,8 @@ jobs: permissions: contents: read issues: write - uses: aws/aws-durable-execution-ci/.github/workflows/stale-issue-closer.yml@d6b017da14385908951d23e26c790b28a4e5f9f0 + uses: aws/aws-durable-execution-ci/.github/workflows/stale-issue-closer.yml@d901b2f1a50731f46bb791b7cae6cbe7f56ae917 + with: + # CodeBuild-hosted runner in the Java testing account; the label must + # match the CodeBuild project name. + runs-on: codebuild-github-actions-runner-${{ github.run_id }}-${{ github.run_attempt }} From b99f50bb3a12ac4abef24a4d8deeee844eaf31a3 Mon Sep 17 00:00:00 2001 From: Alex Wang Date: Wed, 7 Oct 2026 00:28:51 +0000 Subject: [PATCH 2/2] ci: find Java 21 without JAVA_HOME_21_X64 in the OTel setup command JAVA_HOME_21_X64 is a GitHub-hosted image variable. The CodeBuild standard image installs Corretto 21 under /usr/lib/jvm; use it when the variable is absent. --- .github/workflows/otel-conformance-tests.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/otel-conformance-tests.yml b/.github/workflows/otel-conformance-tests.yml index ce63cec01a..bd03189632 100644 --- a/.github/workflows/otel-conformance-tests.yml +++ b/.github/workflows/otel-conformance-tests.yml @@ -77,12 +77,19 @@ jobs: # bundled examples/java. Path is relative to the conformance workspace where the SDK is # checked out (.build/durable-sdk). examples_dir: .build/durable-sdk/conformance-tests-otel + # Java 21 on either runner image: GitHub-hosted runners expose it as + # JAVA_HOME_21_X64, the CodeBuild standard image installs Corretto under + # /usr/lib/jvm. Fail if neither is present rather than building with the + # default JDK. setup_command: | - if [ -z "${JAVA_HOME_21_X64:-}" ]; then + if [ -n "${JAVA_HOME_21_X64:-}" ]; then + export JAVA_HOME="$JAVA_HOME_21_X64" + elif [ -x /usr/lib/jvm/java-21-amazon-corretto/bin/java ]; then + export JAVA_HOME=/usr/lib/jvm/java-21-amazon-corretto + else echo "The runner does not provide Java 21" exit 1 fi - export JAVA_HOME="$JAVA_HOME_21_X64" export PATH="$JAVA_HOME/bin:$PATH" java -version prepare_command: |