From d9c02c576181e57113516d5d73c7e58e240829b4 Mon Sep 17 00:00:00 2001 From: John Murret Date: Fri, 7 Apr 2023 11:10:47 -0600 Subject: [PATCH] increase ENT runner size for xl to match OSS. have guild-distros use xl to match CircleCI (#16920) --- .github/scripts/get_runner_classes.sh | 3 ++- .github/workflows/build-artifacts.yml | 2 +- .github/workflows/build-distros.yml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/scripts/get_runner_classes.sh b/.github/scripts/get_runner_classes.sh index 88b50e4eae..80980b7a8f 100755 --- a/.github/scripts/get_runner_classes.sh +++ b/.github/scripts/get_runner_classes.sh @@ -13,7 +13,8 @@ case "$GITHUB_REPOSITORY" in echo "compute-small=['self-hosted', 'linux', 'small']" >> "$GITHUB_OUTPUT" echo "compute-medium=['self-hosted', 'linux', 'medium']" >> "$GITHUB_OUTPUT" echo "compute-large=['self-hosted', 'linux', 'large']" >> "$GITHUB_OUTPUT" - echo "compute-xl=['self-hosted', 'ondemand', 'linux', 'type=m5.2xlarge']" >> "$GITHUB_OUTPUT" + # m5d.8xlarge is equivalent to our xl custom runner in OSS + echo "compute-xl=['self-hosted', 'ondemand', 'linux', 'type=m5d.8xlarge']" >> "$GITHUB_OUTPUT" ;; *) # shellcheck disable=SC2129 diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 6bc61dec12..57d23d52f5 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -32,7 +32,7 @@ jobs: dev-build-push: needs: setup - runs-on: ${{ fromJSON(needs.setup.outputs.compute-medium) }} + runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }} permissions: id-token: write # NOTE: this permission is explicitly required for Vault auth. contents: read diff --git a/.github/workflows/build-distros.yml b/.github/workflows/build-distros.yml index 38c1d3adca..c8036a7505 100644 --- a/.github/workflows/build-distros.yml +++ b/.github/workflows/build-distros.yml @@ -44,7 +44,7 @@ jobs: - check-go-mod env: XC_OS: "freebsd linux windows" - runs-on: ${{ fromJSON(needs.setup.outputs.compute-medium) }} + runs-on: ${{ fromJSON(needs.setup.outputs.compute-xl) }} steps: - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0 @@ -68,7 +68,7 @@ jobs: - check-go-mod env: XC_OS: "darwin freebsd linux solaris windows" - runs-on: ${{ fromJSON(needs.setup.outputs.compute-medium) }} + runs-on: ${{ fromJSON(needs.setup.outputs.compute-xl) }} steps: - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0