Skip to content

Commit e1fbefc

Browse files
Kobzolrami3l
authored andcommitted
Use ARM based runners for ARM CI targets
1 parent 525f0d5 commit e1fbefc

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

.github/workflows/ci.yaml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ jobs:
518518
# This is ci/actions-templates/linux-builds-template.yaml
519519
# Do not edit this file in .github/workflows
520520
build-linux-pr: # job-name skip-master skip-stable
521-
runs-on: ubuntu-latest
521+
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
522522
if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }} # skip-master skip-stable
523523
permissions:
524524
id-token: write
@@ -537,6 +537,9 @@ jobs:
537537
- target: x86_64-unknown-linux-gnu
538538
run_tests: YES
539539
#snap_arch: amd64
540+
# We add an ARM-based host to the following target.
541+
# We need to do that because rust's CI uses ARM-based runners
542+
# to generate their Dockerfiles.
540543
- target: armv7-unknown-linux-gnueabihf
541544
#snap_arch: armhf
542545
steps:
@@ -678,7 +681,7 @@ jobs:
678681
# This is ci/actions-templates/linux-builds-template.yaml
679682
# Do not edit this file in .github/workflows
680683
build-linux-master: # job-name skip-pr skip-stable
681-
runs-on: ubuntu-latest
684+
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
682685
if: ${{ (github.event_name == 'push' && github.ref_name == 'master') || github.event_name == 'schedule' }} # skip-pr skip-stable
683686
permissions:
684687
id-token: write
@@ -700,8 +703,11 @@ jobs:
700703
- target: x86_64-unknown-linux-gnu
701704
run_tests: YES
702705
#snap_arch: amd64
703-
- target: aarch64-unknown-linux-gnu # skip-pr
704-
#snap_arch: arm64 # skip-pr
706+
# We add an ARM-based host to the following target.
707+
# We need to do that because rust's CI uses ARM-based runners
708+
# to generate their Dockerfiles.
709+
- target: aarch64-unknown-linux-gnu # skip-pr
710+
os: ubuntu-24.04-arm64-4core-16gb # skip-pr
705711
- target: armv7-unknown-linux-gnueabihf
706712
#snap_arch: armhf
707713
steps:
@@ -843,7 +849,7 @@ jobs:
843849
# This is ci/actions-templates/linux-builds-template.yaml
844850
# Do not edit this file in .github/workflows
845851
build-linux-stable: # job-name skip-master skip-pr
846-
runs-on: ubuntu-latest
852+
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
847853
if: ${{ github.event_name == 'push' && github.ref_name == 'stable' }} # skip-pr skip-master
848854
permissions:
849855
id-token: write
@@ -883,8 +889,11 @@ jobs:
883889
#snap_arch: amd64
884890
- target: i686-unknown-linux-gnu # skip-pr skip-master
885891
#snap_arch: i386 # skip-pr skip-master
886-
- target: aarch64-unknown-linux-gnu # skip-pr
887-
#snap_arch: arm64 # skip-pr
892+
# We add an ARM-based host to the following target.
893+
# We need to do that because rust's CI uses ARM-based runners
894+
# to generate their Dockerfiles.
895+
- target: aarch64-unknown-linux-gnu # skip-pr
896+
os: ubuntu-24.04-arm64-4core-16gb # skip-pr
888897
- target: armv7-unknown-linux-gnueabihf
889898
#snap_arch: armhf
890899
- target: powerpc64le-unknown-linux-gnu # skip-pr skip-master

ci/actions-templates/linux-builds-template.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs: # skip-master skip-pr skip-stable
55
build-linux-pr: # job-name skip-master skip-stable
66
build-linux-master: # job-name skip-pr skip-stable
77
build-linux-stable: # job-name skip-master skip-pr
8-
runs-on: ubuntu-latest
8+
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
99
if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }} # skip-master skip-stable
1010
if: ${{ (github.event_name == 'push' && github.ref_name == 'master') || github.event_name == 'schedule' }} # skip-pr skip-stable
1111
if: ${{ github.event_name == 'push' && github.ref_name == 'stable' }} # skip-pr skip-master
@@ -47,8 +47,11 @@ jobs: # skip-master skip-pr skip-stable
4747
#snap_arch: amd64
4848
- target: i686-unknown-linux-gnu # skip-pr skip-master
4949
#snap_arch: i386 # skip-pr skip-master
50-
- target: aarch64-unknown-linux-gnu # skip-pr
51-
#snap_arch: arm64 # skip-pr
50+
# We add an ARM-based host to the following target.
51+
# We need to do that because rust's CI uses ARM-based runners
52+
# to generate their Dockerfiles.
53+
- target: aarch64-unknown-linux-gnu # skip-pr
54+
os: ubuntu-24.04-arm64-4core-16gb # skip-pr
5255
- target: armv7-unknown-linux-gnueabihf
5356
#snap_arch: armhf
5457
- target: powerpc64le-unknown-linux-gnu # skip-pr skip-master

0 commit comments

Comments
 (0)