From 2b600fb4c49e4a4049653f245cddb260b059841b Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sun, 27 Oct 2024 17:55:36 -0700 Subject: [PATCH] Add some gh runners --- .github/workflows/build-salt-onedir.yml | 4 +- .github/workflows/nightly.yml | 28 ++++--------- .github/workflows/release.yml | 24 +++-------- .github/workflows/staging.yml | 41 +++++-------------- .../workflows/templates/build-repos.yml.jinja | 4 +- .github/workflows/templates/ci.yml.jinja | 5 +-- .github/workflows/templates/nightly.yml.jinja | 4 +- .github/workflows/templates/release.yml.jinja | 28 ++++--------- .github/workflows/templates/staging.yml.jinja | 8 +--- 9 files changed, 36 insertions(+), 110 deletions(-) diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml index 5913038bbd2..e3887b9f146 100644 --- a/.github/workflows/build-salt-onedir.yml +++ b/.github/workflows/build-salt-onedir.yml @@ -51,9 +51,7 @@ jobs: - x86_64 - arm64 runs-on: - - self-hosted - - linux - - ${{ matrix.arch }} + - linux-${{ matrix.arch }} steps: - name: "Throttle Builds" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 10182dac0d5..b926ce6e1ca 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2017,9 +2017,7 @@ jobs: name: Build Repository environment: nightly runs-on: - - self-hosted - - linux - - repo-nightly + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -2120,9 +2118,7 @@ jobs: name: Build Repository environment: nightly runs-on: - - self-hosted - - linux - - repo-nightly + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -2251,9 +2247,7 @@ jobs: name: Build Repository environment: nightly runs-on: - - self-hosted - - linux - - repo-nightly + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -2429,9 +2423,7 @@ jobs: name: Build Repository environment: nightly runs-on: - - self-hosted - - linux - - repo-nightly + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -2533,9 +2525,7 @@ jobs: name: Build Repository environment: nightly runs-on: - - self-hosted - - linux - - repo-nightly + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -2626,9 +2616,7 @@ jobs: name: Build Repository environment: nightly runs-on: - - self-hosted - - linux - - repo-nightly + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -2755,9 +2743,7 @@ jobs: name: Publish Repositories if: ${{ always() && ! failure() && ! cancelled() }} runs-on: - - self-hosted - - linux - - repo-nightly + - linux-x86_64 environment: nightly needs: - prepare-workflow diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 30ced2d7efa..a141aa45eef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,9 +49,7 @@ jobs: prepare-workflow: name: Prepare Workflow Run runs-on: - - self-hosted - - linux - - repo-release + - linux-x86_64 env: USE_S3_CACHE: 'true' environment: release @@ -124,9 +122,7 @@ jobs: download-onedir-artifact: name: Download Staging Onedir Artifact runs-on: - - self-hosted - - linux - - repo-release + - linux-x86_64 env: USE_S3_CACHE: 'true' environment: release @@ -190,9 +186,7 @@ jobs: backup: name: Backup runs-on: - - self-hosted - - linux - - repo-release + - linux-x86_64 needs: - prepare-workflow env: @@ -223,9 +217,7 @@ jobs: publish-repositories: name: Publish Repositories runs-on: - - self-hosted - - linux - - repo-release + - linux_x86_64 env: USE_S3_CACHE: 'true' needs: @@ -279,9 +271,7 @@ jobs: name: Release v${{ needs.prepare-workflow.outputs.salt-version }} if: ${{ always() && ! failure() && ! cancelled() }} runs-on: - - self-hosted - - linux - - repo-release + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -395,9 +385,7 @@ jobs: - release environment: release runs-on: - - self-hosted - - linux - - repo-release + - linux-x86_64 env: USE_S3_CACHE: 'true' steps: diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index e625038505e..098b02e0514 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -309,10 +309,7 @@ jobs: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['prepare-release'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} runs-on: - - self-hosted - - linux - - medium - - x86_64 + - linux-x86_64 needs: - prepare-workflow steps: @@ -2002,9 +1999,7 @@ jobs: name: Build Repository environment: staging runs-on: - - self-hosted - - linux - - repo-staging + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -2105,9 +2100,7 @@ jobs: name: Build Repository environment: staging runs-on: - - self-hosted - - linux - - repo-staging + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -2236,9 +2229,7 @@ jobs: name: Build Repository environment: staging runs-on: - - self-hosted - - linux - - repo-staging + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -2416,9 +2407,7 @@ jobs: name: Build Repository environment: staging runs-on: - - self-hosted - - linux - - repo-staging + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -2520,9 +2509,7 @@ jobs: name: Build Repository environment: staging runs-on: - - self-hosted - - linux - - repo-staging + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -2613,9 +2600,7 @@ jobs: name: Build Repository environment: staging runs-on: - - self-hosted - - linux - - repo-staging + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -2742,9 +2727,7 @@ jobs: name: Publish Repositories if: ${{ always() && ! failure() && ! cancelled() }} runs-on: - - self-hosted - - linux - - repo-staging + - linux-x86_64 environment: staging needs: - prepare-workflow @@ -2802,9 +2785,7 @@ jobs: - build-src-repo environment: staging runs-on: - - self-hosted - - linux - - repo-staging + - linux-x86_64 steps: - uses: actions/checkout@v4 @@ -2954,9 +2935,7 @@ jobs: - pkg-download-tests environment: staging runs-on: - - self-hosted - - linux - - repo-staging + - linux-x86_64 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/templates/build-repos.yml.jinja b/.github/workflows/templates/build-repos.yml.jinja index 92f621c857e..24d4be7e084 100644 --- a/.github/workflows/templates/build-repos.yml.jinja +++ b/.github/workflows/templates/build-repos.yml.jinja @@ -14,9 +14,7 @@ name: Build Repository environment: <{ gh_environment }> runs-on: - - self-hosted - - linux - - repo-<{ gh_environment }> + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index cf8a33415ce..8702b761096 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -61,10 +61,7 @@ <%- if prepare_actual_release %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['<{ job_name }>'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} runs-on: - - self-hosted - - linux - - medium - - x86_64 + - linux-x86_64 <%- else %> if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['<{ job_name }>'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} runs-on: ubuntu-latest diff --git a/.github/workflows/templates/nightly.yml.jinja b/.github/workflows/templates/nightly.yml.jinja index 1dcc2212efe..c2157ff523e 100644 --- a/.github/workflows/templates/nightly.yml.jinja +++ b/.github/workflows/templates/nightly.yml.jinja @@ -65,9 +65,7 @@ concurrency: name: Publish Repositories if: ${{ always() && ! failure() && ! cancelled() }} runs-on: - - self-hosted - - linux - - repo-<{ gh_environment }> + - linux-x86_64 environment: <{ gh_environment }> needs: - prepare-workflow diff --git a/.github/workflows/templates/release.yml.jinja b/.github/workflows/templates/release.yml.jinja index cb6d251b966..4a22f6c396d 100644 --- a/.github/workflows/templates/release.yml.jinja +++ b/.github/workflows/templates/release.yml.jinja @@ -71,9 +71,7 @@ permissions: prepare-workflow: name: Prepare Workflow Run runs-on: - - self-hosted - - linux - - repo-<{ gh_environment }> + - linux-x86_64 env: USE_S3_CACHE: 'true' environment: <{ gh_environment }> @@ -156,9 +154,7 @@ permissions: download-onedir-artifact: name: Download Staging Onedir Artifact runs-on: - - self-hosted - - linux - - repo-<{ gh_environment }> + - linux-x86_64 env: USE_S3_CACHE: 'true' environment: <{ gh_environment }> @@ -211,9 +207,7 @@ permissions: backup: name: Backup runs-on: - - self-hosted - - linux - - repo-<{ gh_environment }> + - linux-x86_64 needs: - prepare-workflow env: @@ -245,9 +239,7 @@ permissions: <%- do conclusion_needs.append('publish-repositories') %> name: Publish Repositories runs-on: - - self-hosted - - linux - - repo-<{ gh_environment }> + - linux_x86_64 env: USE_S3_CACHE: 'true' needs: @@ -286,9 +278,7 @@ permissions: name: Release v${{ needs.prepare-workflow.outputs.salt-version }} if: ${{ always() && ! failure() && ! cancelled() }} runs-on: - - self-hosted - - linux - - repo-<{ gh_environment }> + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -402,9 +392,7 @@ permissions: name: Restore Release Bucket From Backup if: ${{ always() && needs.backup.outputs.backup-complete == 'true' && (failure() || cancelled()) }} runs-on: - - self-hosted - - linux - - repo-<{ gh_environment }> + - linux-x86_64 env: USE_S3_CACHE: 'true' needs: @@ -445,9 +433,7 @@ permissions: - restore #} environment: <{ gh_environment }> runs-on: - - self-hosted - - linux - - repo-<{ gh_environment }> + - linux-x86_64 env: USE_S3_CACHE: 'true' steps: diff --git a/.github/workflows/templates/staging.yml.jinja b/.github/workflows/templates/staging.yml.jinja index a15302bc00a..d3e1ab4e2a1 100644 --- a/.github/workflows/templates/staging.yml.jinja +++ b/.github/workflows/templates/staging.yml.jinja @@ -89,9 +89,7 @@ concurrency: - build-src-repo environment: <{ gh_environment }> runs-on: - - self-hosted - - linux - - repo-<{ gh_environment }> + - linux-x86_64 steps: - uses: actions/checkout@v4 @@ -174,9 +172,7 @@ concurrency: <%- endfor %> environment: <{ gh_environment }> runs-on: - - self-hosted - - linux - - repo-<{ gh_environment }> + - linux-x86_64 steps: - uses: actions/checkout@v4