Wean off linux-x86_64 runner

This commit is contained in:
Daniel A. Wozniak 2024-11-08 19:38:04 -07:00 committed by Daniel Wozniak
parent d03d2fb7c9
commit 7d820d56a1
6 changed files with 6 additions and 6 deletions

View file

@ -89,7 +89,7 @@ jobs:
needs:
- generate-matrix
runs-on:
- linux-${{ matrix.arch }}
- ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'linux-arm64' }}
if: ${{ inputs.kind == 'linux' }}
env:
USE_S3_CACHE: 'false'

View file

@ -53,7 +53,7 @@ jobs:
- x86_64
- arm64
runs-on:
- linux-${{ matrix.arch }}
- ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'linux-arm64' }}
env:
USE_S3_CACHE: 'false'
steps:

View file

@ -53,7 +53,7 @@ jobs:
build-deb-packages:
name: DEB
runs-on:
- linux-${{ matrix.arch }}
- ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'linux-arm64' }}
if: ${{ inputs.kind == 'linux' }}
strategy:
fail-fast: false

View file

@ -55,7 +55,7 @@ jobs:
- x86_64
- arm64
runs-on:
- linux-${{ matrix.arch }}
- ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'linux-arm64' }}
steps:
- name: "Throttle Builds"

View file

@ -309,7 +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:
- linux-x86_64
- ubuntu-latest
needs:
- prepare-workflow
steps:

View file

@ -61,7 +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:
- linux-x86_64
- ubuntu-latest
<%- else %>
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['<{ job_name }>'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
runs-on: ubuntu-latest