mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Wean off linux-x86_64 runner
This commit is contained in:
parent
d03d2fb7c9
commit
7d820d56a1
6 changed files with 6 additions and 6 deletions
2
.github/workflows/build-deps-ci-action.yml
vendored
2
.github/workflows/build-deps-ci-action.yml
vendored
|
@ -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'
|
||||
|
|
2
.github/workflows/build-deps-onedir.yml
vendored
2
.github/workflows/build-deps-onedir.yml
vendored
|
@ -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:
|
||||
|
|
2
.github/workflows/build-packages.yml
vendored
2
.github/workflows/build-packages.yml
vendored
|
@ -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
|
||||
|
|
2
.github/workflows/build-salt-onedir.yml
vendored
2
.github/workflows/build-salt-onedir.yml
vendored
|
@ -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"
|
||||
|
|
2
.github/workflows/staging.yml
vendored
2
.github/workflows/staging.yml
vendored
|
@ -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:
|
||||
|
|
2
.github/workflows/templates/ci.yml.jinja
vendored
2
.github/workflows/templates/ci.yml.jinja
vendored
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue