diff --git a/.github/workflows/duvet.yml b/.github/workflows/duvet.yml index 23bbe45a..a916be11 100644 --- a/.github/workflows/duvet.yml +++ b/.github/workflows/duvet.yml @@ -6,7 +6,7 @@ on: jobs: test: - runs-on: ubuntu-slim + runs-on: codebuild-CryptoToolsCI-linux-amazon-s3-encryption-client-python-${{ github.run_id }}-${{ github.run_attempt }} permissions: id-token: write contents: read @@ -20,9 +20,7 @@ jobs: run: git submodule update --init --recursive specification - name: Setup Rust toolchain - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: stable + uses: dtolnay/rust-toolchain@stable - name: Install duvet run: | diff --git a/.github/workflows/python-integ.yml b/.github/workflows/python-integ.yml index 7c22d3e4..0c01dde9 100644 --- a/.github/workflows/python-integ.yml +++ b/.github/workflows/python-integ.yml @@ -16,7 +16,14 @@ jobs: matrix: python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"] os: [ubuntu-latest, macos-latest, windows-latest] - runs-on: ${{ matrix.os }} + include: + - os: ubuntu-latest + runner: codebuild-CryptoToolsCI-linux-amazon-s3-encryption-client-python-${{ github.run_id }}-${{ github.run_attempt }} + - os: macos-latest + runner: macos-latest + - os: windows-latest + runner: windows-latest + runs-on: ${{ matrix.runner }} permissions: id-token: write contents: read @@ -37,10 +44,10 @@ jobs: uses: actions/cache@v5 with: path: ~/.cache/uv - key: ${{ runner.os }}-uv-py${{ matrix.python-version }}-${{ hashFiles('**/pyproject.toml') }} + key: ${{ runner.os == 'Linux' && 'cb-' || '' }}${{ runner.os }}-uv-py${{ matrix.python-version }}-${{ hashFiles('**/pyproject.toml') }} restore-keys: | - ${{ runner.os }}-uv-py${{ matrix.python-version }}- - ${{ runner.os }}-uv- + ${{ runner.os == 'Linux' && 'cb-' || '' }}${{ runner.os }}-uv-py${{ matrix.python-version }}- + ${{ runner.os == 'Linux' && 'cb-' || '' }}${{ runner.os }}-uv- - name: Install Uv run: pip install uv diff --git a/.github/workflows/python-perf.yml b/.github/workflows/python-perf.yml index 38bddb56..1c09efdc 100644 --- a/.github/workflows/python-perf.yml +++ b/.github/workflows/python-perf.yml @@ -11,7 +11,7 @@ on: jobs: python-perf: - runs-on: ubuntu-latest + runs-on: codebuild-CryptoToolsCI-linux-amazon-s3-encryption-client-python-${{ github.run_id }}-${{ github.run_attempt }} permissions: id-token: write contents: read @@ -31,9 +31,9 @@ jobs: uses: actions/cache@v5 with: path: ~/.cache/uv - key: ${{ runner.os }}-uv-${{ hashFiles('**/pyproject.toml') }} + key: ${{ runner.os == 'Linux' && 'cb-' || '' }}${{ runner.os }}-uv-${{ hashFiles('**/pyproject.toml') }} restore-keys: | - ${{ runner.os }}-uv- + ${{ runner.os == 'Linux' && 'cb-' || '' }}${{ runner.os }}-uv- - name: Install Uv run: pip install uv diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f92c07ff..e6093aef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ on: jobs: determine-version: name: Determine Version - runs-on: ubuntu-latest + runs-on: &codebuild-linux codebuild-CryptoToolsCI-linux-amazon-s3-encryption-client-python-${{ github.run_id }}-${{ github.run_attempt }} permissions: contents: write outputs: @@ -65,7 +65,7 @@ jobs: name: Build Package needs: [determine-version, test] if: needs.determine-version.outputs.version != '' - runs-on: ubuntu-latest + runs-on: *codebuild-linux steps: - uses: actions/checkout@v6 - uses: actions/setup-python@v6 @@ -87,7 +87,7 @@ jobs: name: Publish to TestPyPI if: ${{ !inputs.dry_run && needs.determine-version.outputs.version != '' }} needs: [determine-version, build] - runs-on: ubuntu-latest + runs-on: *codebuild-linux environment: testpypi permissions: id-token: write @@ -105,7 +105,7 @@ jobs: name: Validate TestPyPI Package needs: [determine-version, publish-testpypi] if: needs.determine-version.outputs.version != '' - runs-on: ubuntu-latest + runs-on: *codebuild-linux permissions: id-token: write contents: read @@ -143,7 +143,7 @@ jobs: name: Publish to PyPI needs: [determine-version, validate-testpypi] if: needs.determine-version.outputs.version != '' - runs-on: ubuntu-latest + runs-on: *codebuild-linux environment: pypi permissions: id-token: write @@ -158,7 +158,7 @@ jobs: name: Validate PyPI Package needs: [determine-version, publish-pypi] if: needs.determine-version.outputs.version != '' - runs-on: ubuntu-latest + runs-on: *codebuild-linux permissions: id-token: write contents: read @@ -196,7 +196,7 @@ jobs: name: Create GitHub Release if: ${{ !inputs.dry_run && needs.determine-version.outputs.version != '' }} needs: [determine-version, validate-pypi] - runs-on: ubuntu-latest + runs-on: *codebuild-linux permissions: contents: write steps: