From 374185c1f85e099755533c5f2cc52d21ff0d062f Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Thu, 8 Oct 2026 00:08:29 +0000 Subject: [PATCH 1/4] ci: run Linux CI on CodeBuild-hosted runners --- .github/workflows/ci.yml | 16 ++++++++-------- .github/workflows/repo-sync.yml | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ad9207e..ef1d51d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ permissions: jobs: staticAnalysis: name: Static Analysis - runs-on: ubuntu-latest + runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} steps: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 @@ -30,7 +30,7 @@ jobs: image-override: "aws/codebuild/amazonlinux-x86_64-standard:5.0" vectorTests: name: Vector Tests - runs-on: ubuntu-latest + runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} strategy: fail-fast: true matrix: @@ -60,7 +60,7 @@ jobs: JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} vectorTestsMasterKeyProvider: name: Vector Tests MasterKeyProvider - runs-on: ubuntu-latest + runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} strategy: fail-fast: true matrix: @@ -90,7 +90,7 @@ jobs: JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} netVectorTests: name: ESDK-NET Vector Tests - runs-on: ubuntu-latest + runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} strategy: fail-fast: true matrix: @@ -120,7 +120,7 @@ jobs: JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} generateTestVectors: name: Generate Vectors - runs-on: ubuntu-latest + runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} strategy: max-parallel: 1 fail-fast: true @@ -151,7 +151,7 @@ jobs: JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} validateConsumerCompiles: name: Validate Consumer Smoke Test - runs-on: ubuntu-latest + runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} strategy: fail-fast: false matrix: @@ -172,7 +172,7 @@ jobs: --no-transfer-progress releaseCI: name: Release CI - runs-on: ubuntu-latest + runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} steps: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 @@ -194,7 +194,7 @@ jobs: validateCI: name: Validate CI - runs-on: ubuntu-latest + runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} needs: releaseCI strategy: fail-fast: true diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 3023ca15..81c06046 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -11,6 +11,7 @@ jobs: repo-sync: name: Repo Sync environment: repo-sync + # repo-sync actions are Docker container actions. runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From f446644a3570647aabce7e56658a21d9ea296124 Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Thu, 8 Oct 2026 18:43:05 +0000 Subject: [PATCH 2/4] ci: run the Docker-based CI jobs on CodeBuild-hosted runners --- .github/workflows/repo-sync.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 81c06046..3023ca15 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -11,7 +11,6 @@ jobs: repo-sync: name: Repo Sync environment: repo-sync - # repo-sync actions are Docker container actions. runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 52950a488676d89b0e90b07259f236d352dc56b5 Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Thu, 29 Oct 2026 20:22:53 +0000 Subject: [PATCH 3/4] ci: move the remaining Linux jobs to CodeBuild --- .github/workflows/repo-sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml index 3023ca15..574ea62a 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/repo-sync.yml @@ -11,7 +11,7 @@ jobs: repo-sync: name: Repo Sync environment: repo-sync - runs-on: ubuntu-latest + runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} steps: - uses: actions/checkout@v3 - uses: repo-sync/github-sync@v2 From 3ae4f9711f2771c3a930d4e373172b89b1e0acc6 Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Thu, 29 Oct 2026 20:27:20 +0000 Subject: [PATCH 4/4] ci: write the CodeBuild runner label once per file --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef1d51d1..75501c38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ permissions: jobs: staticAnalysis: name: Static Analysis - runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: &codebuild-linux codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} steps: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 @@ -30,7 +30,7 @@ jobs: image-override: "aws/codebuild/amazonlinux-x86_64-standard:5.0" vectorTests: name: Vector Tests - runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: *codebuild-linux strategy: fail-fast: true matrix: @@ -60,7 +60,7 @@ jobs: JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} vectorTestsMasterKeyProvider: name: Vector Tests MasterKeyProvider - runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: *codebuild-linux strategy: fail-fast: true matrix: @@ -90,7 +90,7 @@ jobs: JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} netVectorTests: name: ESDK-NET Vector Tests - runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: *codebuild-linux strategy: fail-fast: true matrix: @@ -120,7 +120,7 @@ jobs: JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} generateTestVectors: name: Generate Vectors - runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: *codebuild-linux strategy: max-parallel: 1 fail-fast: true @@ -151,7 +151,7 @@ jobs: JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} validateConsumerCompiles: name: Validate Consumer Smoke Test - runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: *codebuild-linux strategy: fail-fast: false matrix: @@ -172,7 +172,7 @@ jobs: --no-transfer-progress releaseCI: name: Release CI - runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: *codebuild-linux steps: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 @@ -194,7 +194,7 @@ jobs: validateCI: name: Validate CI - runs-on: codebuild-CryptoToolsCI-linux-aws-encryption-sdk-java-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: *codebuild-linux needs: releaseCI strategy: fail-fast: true