Skip to content

Commit e1fda2e

Browse files
GloriousEggrollGloriousEggroll
committed
add aarch64 builds to workflows
1 parent 9848e2a commit e1fda2e

File tree

7 files changed

+166
-43
lines changed

7 files changed

+166
-43
lines changed

‎.github/workflows/build-umu-debian-12.yml‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,16 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: ubuntu-latest
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
include:
16+
- arch: amd64
17+
runner: ubuntu-latest
18+
- arch: arm64
19+
runner: ubuntu-24.04-arm
20+
21+
runs-on: ${{ matrix.runner }}
1322
container:
1423
image: debian:bookworm
1524
volumes:
@@ -66,19 +75,26 @@ jobs:
6675
- name: Move and rename DEB files to upload artifact path
6776
run: |
6877
mkdir -p results
69-
mv ../python3-umu-launcher_${{ env.VERSION }}-1_amd64.deb \
70-
results/python3-umu-launcher_${{ env.VERSION }}-1_amd64_debian-12.deb
78+
ARCH=$(dpkg --print-architecture)
79+
80+
mv ../python3-umu-launcher_${{ env.VERSION }}-1_${ARCH}.deb \
81+
results/python3-umu-launcher_${{ env.VERSION }}-1_${ARCH}_debian-12.deb
82+
83+
# The _all package is identical across arches; only move/upload once to avoid conflicts
84+
if [ "${ARCH}" = "amd64" ]; then
7185
mv ../umu-launcher_${{ env.VERSION }}-1_all.deb \
72-
results/umu-launcher_${{ env.VERSION }}-1_all_debian-12.deb
86+
results/umu-launcher_${{ env.VERSION }}-1_all_debian-12.deb
87+
fi
7388
7489
- name: Upload artifact
7590
uses: actions/upload-artifact@v6
7691
with:
77-
name: python3-umu-launcher_${{ env.VERSION }}-1_amd64_debian-12.deb
78-
path: results/python3-umu-launcher_${{ env.VERSION }}-1_amd64_debian-12.deb
92+
name: python3-umu-launcher_${{ env.VERSION }}-1_${{ matrix.arch }}_debian-12.deb
93+
path: results/python3-umu-launcher_${{ env.VERSION }}-1_*_debian-12.deb
7994

8095
- name: Upload artifact
8196
uses: actions/upload-artifact@v6
97+
if: ${{ matrix.arch == 'amd64' }}
8298
with:
8399
name: umu-launcher_${{ env.VERSION }}-1_all_debian-12.deb
84100
path: results/umu-launcher_${{ env.VERSION }}-1_all_debian-12.deb

‎.github/workflows/build-umu-debian-13.yml‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-latest
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
include:
15+
- arch: amd64
16+
runner: ubuntu-latest
17+
- arch: arm64
18+
runner: ubuntu-24.04-arm
19+
20+
runs-on: ${{ matrix.runner }}
1221
container:
1322
image: debian:trixie
1423
volumes:
@@ -65,19 +74,27 @@ jobs:
6574
- name: Move and rename DEB files to upload artifact path
6675
run: |
6776
mkdir -p results
68-
mv ../python3-umu-launcher_${{ env.VERSION }}-1_amd64.deb \
69-
results/python3-umu-launcher_${{ env.VERSION }}-1_amd64_debian-13.deb
77+
ARCH=$(dpkg --print-architecture)
78+
79+
mv ../python3-umu-launcher_${{ env.VERSION }}-1_${ARCH}.deb \
80+
results/python3-umu-launcher_${{ env.VERSION }}-1_${ARCH}_debian-13.deb
81+
82+
# The _all package is identical across arches; only move/upload once to avoid conflicts
83+
if [ "${ARCH}" = "amd64" ]; then
7084
mv ../umu-launcher_${{ env.VERSION }}-1_all.deb \
71-
results/umu-launcher_${{ env.VERSION }}-1_all_debian-13.deb
85+
results/umu-launcher_${{ env.VERSION }}-1_all_debian-13.deb
86+
fi
87+
7288
7389
- name: Upload artifact
7490
uses: actions/upload-artifact@v6
7591
with:
76-
name: python3-umu-launcher_${{ env.VERSION }}-1_amd64_debian-13.deb
77-
path: results/python3-umu-launcher_${{ env.VERSION }}-1_amd64_debian-13.deb
92+
name: python3-umu-launcher_${{ env.VERSION }}-1_${{ matrix.arch }}_debian-13.deb
93+
path: results/python3-umu-launcher_${{ env.VERSION }}-1_*_debian-13.deb
7894

7995
- name: Upload artifact
8096
uses: actions/upload-artifact@v6
97+
if: ${{ matrix.arch == 'amd64' }}
8198
with:
8299
name: umu-launcher_${{ env.VERSION }}-1_all_debian-13.deb
83100
path: results/umu-launcher_${{ env.VERSION }}-1_all_debian-13.deb

‎.github/workflows/build-umu-fedora-42.yml‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,16 @@ on:
1212

1313
jobs:
1414
build:
15-
runs-on: ubuntu-latest
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
include:
19+
- arch: amd64
20+
runner: ubuntu-latest
21+
- arch: arm64
22+
runner: ubuntu-24.04-arm
23+
24+
runs-on: ${{ matrix.runner }}
1625
container:
1726
image: fedora:42
1827

@@ -67,12 +76,16 @@ jobs:
6776
sed -i "s|^%global commit .*|%global commit ${{ env.COMMIT_SHA }}|g" packaging/rpm/umu-launcher.spec
6877
cat packaging/rpm/umu-launcher.spec | grep commit
6978
79+
RPMARCH=$(rpm --eval '%{_arch}')
80+
mkdir -p ~/rpmbuild/RPMS/${RPMARCH}
81+
7082
rpmbuild -ba packaging/rpm/umu-launcher.spec
71-
mv ~/rpmbuild/RPMS/x86_64/umu-launcher-${{ env.VERSION }}*.rpm \
72-
~/rpmbuild/RPMS/x86_64/umu-launcher-${{ env.VERSION }}.fc42.rpm
83+
84+
mv ~/rpmbuild/RPMS/${RPMARCH}/umu-launcher-${VERSION}*.rpm \
85+
~/rpmbuild/RPMS/${RPMARCH}/umu-launcher-${VERSION}.fc42.${RPMARCH}.rpm
7386
7487
- name: Fedora-42
7588
uses: actions/upload-artifact@v6
7689
with:
77-
name: umu-launcher-${{ env.VERSION }}.fc42.rpm
78-
path: ~/rpmbuild/RPMS/x86_64/umu-launcher-${{ env.VERSION }}.fc42.rpm
90+
name: umu-launcher-${{ env.VERSION }}.fc42.${{ matrix.arch }}.rpm
91+
path: ~/rpmbuild/RPMS/*/umu-launcher-${{ env.VERSION }}.fc42.*.rpm

‎.github/workflows/build-umu-fedora-43.yml‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,16 @@ on:
1212

1313
jobs:
1414
build:
15-
runs-on: ubuntu-latest
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
include:
19+
- arch: amd64
20+
runner: ubuntu-latest
21+
- arch: arm64
22+
runner: ubuntu-24.04-arm
23+
24+
runs-on: ${{ matrix.runner }}
1625
container:
1726
image: fedora:43
1827

@@ -68,12 +77,16 @@ jobs:
6877
sed -i "s|^%global commit .*|%global commit ${{ env.COMMIT_SHA }}|g" packaging/rpm/umu-launcher.spec
6978
cat packaging/rpm/umu-launcher.spec | grep commit
7079
80+
RPMARCH=$(rpm --eval '%{_arch}')
81+
mkdir -p ~/rpmbuild/RPMS/${RPMARCH}
82+
7183
rpmbuild -ba packaging/rpm/umu-launcher.spec
72-
mv ~/rpmbuild/RPMS/x86_64/umu-launcher-${{ env.VERSION }}*.rpm \
73-
~/rpmbuild/RPMS/x86_64/umu-launcher-${{ env.VERSION }}.fc43.rpm
84+
85+
mv ~/rpmbuild/RPMS/${RPMARCH}/umu-launcher-${VERSION}*.rpm \
86+
~/rpmbuild/RPMS/${RPMARCH}/umu-launcher-${VERSION}.fc43.${RPMARCH}.rpm
7487
7588
- name: Fedora-43
7689
uses: actions/upload-artifact@v6
7790
with:
78-
name: umu-launcher-${{ env.VERSION }}.fc43.rpm
79-
path: ~/rpmbuild/RPMS/x86_64/umu-launcher-${{ env.VERSION }}.fc43.rpm
91+
name: umu-launcher-${{ env.VERSION }}.fc43.${{ matrix.arch }}.rpm
92+
path: ~/rpmbuild/RPMS/*/umu-launcher-${{ env.VERSION }}.fc43.*.rpm

‎.github/workflows/build-umu-nix-flake.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,15 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: ubuntu-latest
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
include:
16+
- arch: amd64
17+
runner: ubuntu-latest
18+
- arch: arm64
19+
runner: ubuntu-24.04-arm
20+
runs-on: ${{ matrix.runner }}
1321

1422
# TODO: setup binary cache
1523
steps:

‎.github/workflows/build-umu-ubuntu-noble.yml‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,16 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: ubuntu-latest
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
include:
16+
- arch: amd64
17+
runner: ubuntu-latest
18+
- arch: arm64
19+
runner: ubuntu-24.04-arm
20+
21+
runs-on: ${{ matrix.runner }}
1322
container:
1423
image: ubuntu:noble
1524
volumes:
@@ -67,19 +76,26 @@ jobs:
6776
- name: Move and rename DEB files to upload artifact path
6877
run: |
6978
mkdir -p results
70-
mv ../python3-umu-launcher_${{ env.VERSION }}-1_amd64.deb \
71-
results/python3-umu-launcher_${{ env.VERSION }}-1_amd64_ubuntu-noble.deb
79+
ARCH=$(dpkg --print-architecture)
80+
81+
mv ../python3-umu-launcher_${{ env.VERSION }}-1_${ARCH}.deb \
82+
results/python3-umu-launcher_${{ env.VERSION }}-1_${ARCH}_debian-12.deb
83+
84+
# The _all package is identical across arches; only move/upload once to avoid conflicts
85+
if [ "${ARCH}" = "amd64" ]; then
7286
mv ../umu-launcher_${{ env.VERSION }}-1_all.deb \
73-
results/umu-launcher_${{ env.VERSION }}-1_all_ubuntu-noble.deb
87+
results/umu-launcher_${{ env.VERSION }}-1_all_debian-12.deb
88+
fi
7489
7590
- name: Upload artifact
7691
uses: actions/upload-artifact@v6
7792
with:
78-
name: python3-umu-launcher_${{ env.VERSION }}-1_amd64_ubuntu-noble.deb
79-
path: results/python3-umu-launcher_${{ env.VERSION }}-1_amd64_ubuntu-noble.deb
93+
name: python3-umu-launcher_${{ env.VERSION }}-1_${{ matrix.arch }}_ubuntu-noble.deb
94+
path: results/python3-umu-launcher_${{ env.VERSION }}-1_*_ubuntu-noble.deb
8095

8196
- name: Upload artifact
8297
uses: actions/upload-artifact@v6
98+
if: ${{ matrix.arch == 'amd64' }}
8399
with:
84100
name: umu-launcher_${{ env.VERSION }}-1_all_ubuntu-noble.deb
85101
path: results/umu-launcher_${{ env.VERSION }}-1_all_ubuntu-noble.deb

‎.github/workflows/release.yml‎

Lines changed: 54 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,53 @@ jobs:
1111
with:
1212
version: ${{ github.ref_name }}
1313
shasum: ${{ github.sha }}
14-
fedora42-release:
15-
name: Fedora 42 Release ${{ github.ref_name }}
14+
fedora42-release-x86_64:
15+
name: Fedora 42 Release ${{ github.ref_name }} (x86_64)
1616
needs: fedora42-build
1717
uses: ./.github/workflows/build-umu-publish-release.yml
1818
with:
1919
version: ${{ github.ref_name }}
20-
file1: umu-launcher-${{ github.ref_name }}.fc42.rpm
21-
name1: umu-launcher-${{ github.ref_name }}.fc42.rpm
20+
file1: umu-launcher-${{ github.ref_name }}.fc42.x86_64.rpm
21+
name1: umu-launcher-${{ github.ref_name }}.fc42.x86_64.rpm
22+
fedora42-release-aarch64:
23+
name: Fedora 42 Release ${{ github.ref_name }} (aarch64)
24+
needs: fedora42-build
25+
uses: ./.github/workflows/build-umu-publish-release.yml
26+
with:
27+
version: ${{ github.ref_name }}
28+
file1: umu-launcher-${{ github.ref_name }}.fc42.aarch64.rpm
29+
name1: umu-launcher-${{ github.ref_name }}.fc42.aarch64.rpm
2230

2331
fedora43-build:
2432
name: Fedora 43 Build
2533
uses: ./.github/workflows/build-umu-fedora-43.yml
2634
with:
2735
version: ${{ github.ref_name }}
2836
shasum: ${{ github.sha }}
29-
fedora43-release:
30-
name: Fedora 43 Release ${{ github.ref_name }}
37+
fedora43-release-x86_64:
38+
name: Fedora 43 Release ${{ github.ref_name }} (x86_64)
39+
needs: fedora43-build
40+
uses: ./.github/workflows/build-umu-publish-release.yml
41+
with:
42+
version: ${{ github.ref_name }}
43+
file1: umu-launcher-${{ github.ref_name }}.fc43.x86_64.rpm
44+
name1: umu-launcher-${{ github.ref_name }}.fc43.x86_64.rpm
45+
fedora43-release-aarch64:
46+
name: Fedora 43 Release ${{ github.ref_name }} (aarch64)
3147
needs: fedora43-build
3248
uses: ./.github/workflows/build-umu-publish-release.yml
3349
with:
3450
version: ${{ github.ref_name }}
35-
file1: umu-launcher-${{ github.ref_name }}.fc43.rpm
36-
name1: umu-launcher-${{ github.ref_name }}.fc43.rpm
51+
file1: umu-launcher-${{ github.ref_name }}.fc43.aarch64.rpm
52+
name1: umu-launcher-${{ github.ref_name }}.fc43.aarch64.rpm
3753

3854
debian12-build:
3955
name: Debian 12 Build
4056
uses: ./.github/workflows/build-umu-debian-12.yml
4157
with:
4258
version: ${{ github.ref_name }}
43-
debian12-release:
44-
name: Debian 12 Release ${{ github.ref_name }}
59+
debian12-release-amd64:
60+
name: Debian 12 Release ${{ github.ref_name }} (amd64)
4561
needs: debian12-build
4662
uses: ./.github/workflows/build-umu-publish-release.yml
4763
with:
@@ -50,14 +66,22 @@ jobs:
5066
name1: python3-umu-launcher_${{ github.ref_name }}-1_amd64_debian-12.deb
5167
file2: umu-launcher_${{ github.ref_name }}-1_all_debian-12.deb
5268
name2: umu-launcher_${{ github.ref_name }}-1_all_debian-12.deb
69+
debian12-release-arm64:
70+
name: Debian 12 Release ${{ github.ref_name }} (arm64)
71+
needs: debian12-build
72+
uses: ./.github/workflows/build-umu-publish-release.yml
73+
with:
74+
version: ${{ github.ref_name }}
75+
file1: python3-umu-launcher_${{ github.ref_name }}-1_arm64_debian-12.deb
76+
name1: python3-umu-launcher_${{ github.ref_name }}-1_arm64_debian-12.deb
5377

5478
debian13-build:
5579
name: Debian 13 Build
5680
uses: ./.github/workflows/build-umu-debian-13.yml
5781
with:
5882
version: ${{ github.ref_name }}
59-
debian13-release:
60-
name: Debian 13 Release ${{ github.ref_name }}
83+
debian13-release-amd64:
84+
name: Debian 13 Release ${{ github.ref_name }} (amd64)
6185
needs: debian13-build
6286
uses: ./.github/workflows/build-umu-publish-release.yml
6387
with:
@@ -66,14 +90,22 @@ jobs:
6690
name1: python3-umu-launcher_${{ github.ref_name }}-1_amd64_debian-13.deb
6791
file2: umu-launcher_${{ github.ref_name }}-1_all_debian-13.deb
6892
name2: umu-launcher_${{ github.ref_name }}-1_all_debian-13.deb
93+
debian13-release-arm64:
94+
name: Debian 13 Release ${{ github.ref_name }} (arm64)
95+
needs: debian13-build
96+
uses: ./.github/workflows/build-umu-publish-release.yml
97+
with:
98+
version: ${{ github.ref_name }}
99+
file1: python3-umu-launcher_${{ github.ref_name }}-1_arm64_debian-13.deb
100+
name1: python3-umu-launcher_${{ github.ref_name }}-1_arm64_debian-13.deb
69101

70102
ubuntu-noble-build:
71103
name: Ubuntu 24.04 Build
72104
uses: ./.github/workflows/build-umu-ubuntu-noble.yml
73105
with:
74106
version: ${{ github.ref_name }}
75-
ubuntu-noble-release:
76-
name: Ubuntu 24.04 Release ${{ github.ref_name }}
107+
ubuntu-noble-release-amd64:
108+
name: Ubuntu 24.04 Release ${{ github.ref_name }} (amd64)
77109
needs: ubuntu-noble-build
78110
uses: ./.github/workflows/build-umu-publish-release.yml
79111
with:
@@ -82,6 +114,14 @@ jobs:
82114
name1: python3-umu-launcher_${{ github.ref_name }}-1_amd64_ubuntu-noble.deb
83115
file2: umu-launcher_${{ github.ref_name }}-1_all_ubuntu-noble.deb
84116
name2: umu-launcher_${{ github.ref_name }}-1_all_ubuntu-noble.deb
117+
ubuntu-noble-release-arm64:
118+
name: Ubuntu 24.04 Release ${{ github.ref_name }} (arm64)
119+
needs: ubuntu-noble-build
120+
uses: ./.github/workflows/build-umu-publish-release.yml
121+
with:
122+
version: ${{ github.ref_name }}
123+
file1: python3-umu-launcher_${{ github.ref_name }}-1_arm64_ubuntu-noble.deb
124+
name1: python3-umu-launcher_${{ github.ref_name }}-1_arm64_ubuntu-noble.deb
85125

86126
zipapp-build:
87127
name: Zipapp Build

0 commit comments

Comments
 (0)