Skip to content

Commit 7d1f6d8

Browse files
committed
Use arm64 runners for aarch64 builds
As we're now effectively building only aarch64 or amd64, we can simply pass the arch to the builder image argument.
1 parent 1ab2fc9 commit 7d1f6d8

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

.github/workflows/builder.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
jobs:
1717
init:
1818
name: Initialize build
19-
runs-on: &runs-on-ubuntu ubuntu-24.04
19+
runs-on: ubuntu-24.04
2020
outputs:
2121
architectures_alpine: ${{ steps.info_alpine.outputs.architectures }}
2222
architectures_debian: ${{ steps.info_debian.outputs.architectures }}
@@ -61,7 +61,7 @@ jobs:
6161
build_alpine:
6262
name: Build ${{ matrix.arch }} alpine ${{ matrix.version }} base image
6363
needs: init
64-
runs-on: *runs-on-ubuntu
64+
runs-on: &builder-runs-on ${{ matrix.arch == 'aarch64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
6565
permissions: &permissions
6666
contents: read
6767
id-token: write
@@ -96,6 +96,7 @@ jobs:
9696
- name: Build base image
9797
uses: home-assistant/[email protected]
9898
with:
99+
image: ${{ matrix.arch }}
99100
args: |
100101
$BUILD_ARGS \
101102
--${{ matrix.arch }} \
@@ -107,7 +108,7 @@ jobs:
107108
build_debian:
108109
name: Build ${{ matrix.arch }} debian ${{ matrix.version }} base image
109110
needs: init
110-
runs-on: *runs-on-ubuntu
111+
runs-on: *builder-runs-on
111112
permissions: *permissions
112113
strategy:
113114
matrix:
@@ -133,6 +134,7 @@ jobs:
133134
- name: Build base image
134135
uses: home-assistant/[email protected]
135136
with:
137+
image: ${{ matrix.arch }}
136138
args: |
137139
$BUILD_ARGS \
138140
--${{ matrix.arch }} \
@@ -145,7 +147,7 @@ jobs:
145147
build_ubuntu:
146148
name: Build ${{ matrix.arch }} ubuntu ${{ matrix.version }} base image
147149
needs: init
148-
runs-on: *runs-on-ubuntu
150+
runs-on: *builder-runs-on
149151
permissions: *permissions
150152
strategy:
151153
matrix:
@@ -182,7 +184,7 @@ jobs:
182184
build_python:
183185
name: Build ${{ matrix.arch }} alpine ${{ matrix.version }} - python ${{ matrix.python }} base image
184186
needs: [init, build_alpine]
185-
runs-on: *runs-on-ubuntu
187+
runs-on: *builder-runs-on
186188
permissions: *permissions
187189
strategy:
188190
fail-fast: false
@@ -210,6 +212,7 @@ jobs:
210212
- name: Build base image
211213
uses: home-assistant/[email protected]
212214
with:
215+
image: ${{ matrix.arch }}
213216
args: |
214217
$BUILD_ARGS \
215218
--${{ matrix.arch }} \

0 commit comments

Comments
 (0)