diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fa679171486..6abd7e07b37 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,7 +33,7 @@ jobs: goreleaser: if: github.event.pull_request.draft == false name: '${{ matrix.golang_cross }}' - runs-on: ubuntu-latest-m + runs-on: ${{ vars.DEFAULT_RUNNER }} permissions: id-token: write # AWS OIDC JWT contents: read # actions/checkout @@ -80,7 +80,19 @@ jobs: registry: docker.tyk.io username: ${{ secrets.CLOUDSMITH_USERNAME }} password: ${{ secrets.CLOUDSMITH_API_KEY }} - - uses: actions/cache@v4 + - uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: arn:aws:iam::754489498669:role/ecr_rw_tyk + role-session-name: cipush + aws-region: eu-central-1 + # Don't mask to pass it across job boundaries + mask-aws-account-id: false + - uses: aws-actions/amazon-ecr-login@v2 + id: ecr + if: ${{ matrix.golang_cross == '1.24-bullseye' }} + with: + mask-password: 'true' + - uses: WarpBuilds/cache@v1 with: path: | ~/.cache/go-build @@ -119,18 +131,6 @@ jobs: -v /tmp/build.sh:/tmp/build.sh \ -w /go/src/github.com/TykTechnologies/tyk \ tykio/golang-cross:${{ matrix.golang_cross }} /tmp/build.sh - - uses: aws-actions/configure-aws-credentials@v4 - with: - role-to-assume: arn:aws:iam::754489498669:role/ecr_rw_tyk - role-session-name: cipush - aws-region: eu-central-1 - # Don't mask to pass it across job boundaries - mask-aws-account-id: false - - uses: aws-actions/amazon-ecr-login@v2 - id: ecr - if: ${{ matrix.golang_cross == '1.24-bullseye' }} - with: - mask-password: 'true' - name: Docker metadata for ee CI id: ci_metadata_ee if: ${{ matrix.golang_cross == '1.24-bullseye' }} @@ -286,7 +286,7 @@ jobs: resolve-dashboard-image: if: github.event.pull_request.draft == false needs: goreleaser - runs-on: ubuntu-latest + runs-on: warp-ubuntu-latest-x64-8x permissions: id-token: write contents: read @@ -477,7 +477,7 @@ jobs: build-dashboard-image: if: needs.resolve-dashboard-image.outputs.needs_build == 'true' needs: resolve-dashboard-image - runs-on: ubuntu-latest-m + runs-on: ${{ vars.DEFAULT_RUNNER }} permissions: id-token: write contents: read @@ -526,7 +526,7 @@ jobs: mask-password: 'true' - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - uses: actions/cache@v4 + - uses: WarpBuilds/cache@v1 with: path: | ~/.cache/go-build @@ -639,7 +639,7 @@ jobs: if: github.event.pull_request.draft == false needs: - goreleaser - runs-on: ubuntu-latest + runs-on: ${{ vars.DEFAULT_RUNNER }} outputs: envfiles: ${{ steps.params.outputs.envfiles }} pump: ${{ steps.params.outputs.pump }} @@ -665,7 +665,7 @@ jobs: needs.goreleaser.result == 'success' && needs.resolve-dashboard-image.result == 'success' && (needs.build-dashboard-image.result == 'success' || needs.build-dashboard-image.result == 'skipped') - runs-on: ubuntu-latest-m-2 + runs-on: ${{ vars.DEFAULT_RUNNER }} env: XUNIT_REPORT_PATH: ${{ github.workspace}}/test-results.xml permissions: @@ -734,7 +734,7 @@ jobs: execution_status: ${{ steps.test_execution.outcome }} aggregator-ci-test: name: Aggregated CI Status - runs-on: ubuntu-latest + runs-on: ${{ vars.DEFAULT_RUNNER }} # Dynamically determine which jobs to depend on based on repository configuration needs: [goreleaser, api-tests] if: ${{ always() && github.event_name == 'pull_request' }} @@ -766,7 +766,7 @@ jobs: if: github.event.pull_request.draft == false needs: - goreleaser - runs-on: ubuntu-latest + runs-on: ${{ vars.DEFAULT_RUNNER }} outputs: deb: ${{ steps.params.outputs.deb }} rpm: ${{ steps.params.outputs.rpm }} @@ -787,7 +787,7 @@ jobs: services: httpbin.org: image: kennethreitz/httpbin - runs-on: ubuntu-latest + runs-on: ${{ vars.DEFAULT_RUNNER }} needs: - test-controller-distros strategy: @@ -845,7 +845,7 @@ jobs: services: httpbin.org: image: kennethreitz/httpbin - runs-on: ubuntu-latest + runs-on: ${{ vars.DEFAULT_RUNNER }} needs: - test-controller-distros strategy: