From d99cf99c82d94139ccc40b84b61e99615dd9fa0a Mon Sep 17 00:00:00 2001 From: lea Date: Mon, 17 Feb 2025 10:06:39 +0100 Subject: [PATCH] chore(ci): rename arm64-lg (#3396) (#3400) * 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) # Conflicts: # .github/workflows/autobuild.yml # .github/workflows/bootstrap.yml # .github/workflows/build.yml # .github/workflows/json-build.yml 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 3fdbeeb226..aafa204ffc 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -42,7 +42,7 @@ jobs: pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }} version: ["10"] fail-fast: false - runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }} + 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:el${{ matrix.version }} options: --cap-add=SYS_ADMIN --privileged diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 93ce239502..d9807c73de 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -10,7 +10,7 @@ jobs: version: ["10"] arch: ["x86_64", "aarch64"] fail-fast: true - runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} + runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || 'ubuntu-22.04' }} container: image: quay.io/almalinuxorg/almalinux:${{ matrix.version }}-kitten options: --cap-add=SYS_ADMIN --privileged diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5db75cf913..7b15116eb6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,7 @@ jobs: version: ["10"] arch: ${{ fromJson(needs.parse.outputs.arch) }} fail-fast: false - runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }} + 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:el${{ matrix.version }} options: --cap-add=SYS_ADMIN --privileged diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index 89669cba2f..3ced641f63 100644 --- a/.github/workflows/json-build.yml +++ b/.github/workflows/json-build.yml @@ -13,7 +13,7 @@ jobs: pkg: ${{ fromJson(inputs.packages) }} version: ["10"] fail-fast: false - runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} + 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:el${{ matrix.version }} options: --cap-add=SYS_ADMIN --privileged