From cef5e641194da9e6fa38d33a380f22282dae9d27 Mon Sep 17 00:00:00 2001 From: lea Date: Mon, 17 Feb 2025 10:06:54 +0100 Subject: [PATCH] chore(ci): rename arm64-lg (#3396) (#3397) * chore(ci): rename arm64-lg Signed-off-by: madomado * Update build.yml Signed-off-by: madomado * Update json-build.yml Signed-off-by: madomado * Update bootstrap.yml Signed-off-by: madomado --------- Signed-off-by: madomado (cherry picked from commit 7f086256270081a9618e1c11d0f731b8ff8fd4fd) Co-authored-by: madomado --- .github/workflows/autobuild.yml | 2 +- .github/workflows/bootstrap.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/json-build.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index db21a7fd6f..c888cf7dea 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -42,7 +42,7 @@ jobs: pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }} version: ["40"] fail-fast: false - runs-on: ${{ (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'ARM64' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }} + runs-on: ${{ (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }} container: image: ghcr.io/terrapkg/builder:f${{ matrix.version }} options: --cap-add=SYS_ADMIN --privileged diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 5e9e2a5ec3..9f51da92c0 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -10,7 +10,7 @@ jobs: version: ["40"] arch: ["x86_64", "aarch64"] fail-fast: true - runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-22.04' }} + runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || 'ubuntu-22.04' }} container: image: registry.fedoraproject.org/fedora-minimal:${{ matrix.version }} options: --cap-add=SYS_ADMIN --privileged diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9879e8ef38..97d611f61d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,7 @@ jobs: version: ["40"] arch: ${{ fromJson(needs.parse.outputs.arch) }} fail-fast: false - runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-22.04' }} + runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-22.04' }} container: image: ghcr.io/terrapkg/builder:f${{ matrix.version }} options: --cap-add=SYS_ADMIN --privileged diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index da943e6d5b..0ec2d5e06a 100644 --- a/.github/workflows/json-build.yml +++ b/.github/workflows/json-build.yml @@ -13,7 +13,7 @@ jobs: pkg: ${{ fromJson(inputs.packages) }} version: ["40"] fail-fast: false - runs-on: ${{ (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'ARM64' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }} + runs-on: ${{ (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }} container: image: ghcr.io/terrapkg/builder:f${{ matrix.version }} options: --cap-add=SYS_ADMIN --privileged