Drop deprecated architectures, build aarch64 on ARM runners #324
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -11,18 +11,16 @@ env: | |||||
| ALPINE_LATEST: "3.22" | ||||||
| DEBIAN_LATEST: "trixie" | ||||||
| UBUNTU_LATEST: "24.04" | ||||||
| PYTHON_LATEST: "3.13" | ||||||
|
|
||||||
| jobs: | ||||||
| init: | ||||||
| name: Initialize build | ||||||
| runs-on: ubuntu-24.04 | ||||||
sairon marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
| outputs: | ||||||
| architectures_alpine: ${{ steps.info_alpine.outputs.architectures }} | ||||||
| architectures_debian: ${{ steps.info_debian.outputs.architectures }} | ||||||
| architectures_ubuntu: ${{ steps.info_ubuntu.outputs.architectures }} | ||||||
| release: ${{ steps.version.outputs.version }} | ||||||
| steps: | ||||||
| - name: Checkout the repository | ||||||
|
|
@@ -48,12 +46,6 @@ jobs: | |||||
| with: | ||||||
| path: "${{ github.workspace }}/ubuntu" | ||||||
|
|
||||||
| - name: Get version | ||||||
| id: version | ||||||
| uses: home-assistant/actions/helpers/version@master | ||||||
|
|
@@ -63,7 +55,7 @@ jobs: | |||||
| build_alpine: | ||||||
| name: Build ${{ matrix.arch }} alpine ${{ matrix.version }} base image | ||||||
| needs: init | ||||||
| runs-on: &builder-runs-on ${{ matrix.arch == 'aarch64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }} | ||||||
|
||||||
| runs-on: &builder-runs-on ${{ matrix.arch == 'aarch64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }} | |
| runs-on: ${{ matrix.os }} |
I'd suggest to use matrix.include instead. This looks cleaner than the ternary expression here. Will leave a suggestion below.
Member
Author
There was a problem hiding this comment.
IMHO it's a matter of personal preference, I find this more readable than wrapping my head around how the matrix looks like with overrides and additions in include - although with just two combinations it's not that much convoluted.
Contributor
There was a problem hiding this comment.
matrix.include is more durable. Add a comment if you need to explain the code what is the expected range of values.
sairon marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
sairon marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,6 @@ | ||
| ARG BUILD_FROM | ||
| # amd64: alpine:${VERSION} | ||
| # aarch64: arm64v8/alpine:${VERSION} | ||
|
|
||
| FROM ${BUILD_FROM} | ||
|
|
||
|
|
@@ -48,11 +45,7 @@ RUN \ | |
| autoconf \ | ||
| git \ | ||
| \ | ||
| && if [ "${BUILD_ARCH}" = "amd64" ]; then \ | ||
| export S6_ARCH="x86_64"; \ | ||
| else \ | ||
| export S6_ARCH="${BUILD_ARCH}"; \ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,7 @@ | ||
| image: ghcr.io/home-assistant/{arch}-base | ||
| build_from: | ||
| aarch64: "arm64v8/alpine:" | ||
| amd64: "alpine:" | ||
| cosign: | ||
| identity: https://github.com/home-assistant/docker-base/.* | ||
| args: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,6 @@ | ||
| ARG BUILD_FROM | ||
| # amd64: debian:${VERSION}-slim | ||
| # aarch64: arm64v8/debian:${VERSION}-slim | ||
|
|
||
| FROM ${BUILD_FROM} | ||
|
|
||
|
|
@@ -42,11 +39,7 @@ RUN \ | |
| xz-utils \ | ||
| && mkdir -p /usr/share/man/man1 \ | ||
| \ | ||
| && if [ "${BUILD_ARCH}" = "amd64" ]; then \ | ||
| export S6_ARCH="x86_64"; \ | ||
| else \ | ||
| export S6_ARCH="${BUILD_ARCH}"; \ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,7 @@ | ||
| image: ghcr.io/home-assistant/{arch}-base-debian | ||
| build_from: | ||
| aarch64: "arm64v8/debian:" | ||
| amd64: "debian:" | ||
| cosign: | ||
| identity: https://github.com/home-assistant/docker-base/.* | ||
| args: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,7 @@ | ||
| image: ghcr.io/home-assistant/{arch}-base-python | ||
| build_from: | ||
| aarch64: "ghcr.io/home-assistant/aarch64-base:" | ||
| amd64: "ghcr.io/home-assistant/amd64-base:" | ||
| cosign: | ||
| base_identity: https://github.com/home-assistant/docker-base/.* | ||
| identity: https://github.com/home-assistant/docker-base/.* | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,7 @@ | ||
| image: ghcr.io/home-assistant/{arch}-base-python | ||
| build_from: | ||
| aarch64: "ghcr.io/home-assistant/aarch64-base:" | ||
| amd64: "ghcr.io/home-assistant/amd64-base:" | ||
| cosign: | ||
| base_identity: https://github.com/home-assistant/docker-base/.* | ||
| identity: https://github.com/home-assistant/docker-base/.* | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,7 @@ | ||
| image: ghcr.io/home-assistant/{arch}-base-python | ||
| build_from: | ||
| aarch64: "ghcr.io/home-assistant/aarch64-base:" | ||
| amd64: "ghcr.io/home-assistant/amd64-base:" | ||
| cosign: | ||
| base_identity: https://github.com/home-assistant/docker-base/.* | ||
| identity: https://github.com/home-assistant/docker-base/.* | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The default for Python should be updated to
3.14. It was deferred previously as 3.14 was only added fromamd64andaarch64.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe let's do it as a separate PR, so it's more prominent in the changelog?