Skip to content

Commit edcd536

Browse files
ci: Restore tests on Debian 13 and Fedora 41 (#88)
1 parent a3414bc commit edcd536

File tree

3 files changed

+30
-23
lines changed

3 files changed

+30
-23
lines changed

.github/workflows/appimage.yml

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@ jobs:
3030
pubkey: 54404762BBB6E853
3131
pubkey_security: 6ED0E7B82643E131
3232
recipe: AppImageBuilder.debian.yml
33-
# - os: debian
34-
# codename: trixie
35-
# pubkey: 0E98404D386FA1D9
36-
# pubkey_security: 54404762BBB6E853
37-
# recipe: AppImageBuilder.debian.yml
33+
- os: debian
34+
codename: trixie
35+
pubkey: BDE6D2B9216EC7A8
36+
pubkey_security: 8E9F831205B4BA95
37+
pubkey_updates: 78DBA3BC47EF2265
38+
recipe: AppImageBuilder.debian.yml
3839

3940
steps:
40-
- uses: actions/checkout@v4
41+
- uses: actions/checkout@v5
4142
with:
4243
fetch-depth: 0
4344
- uses: rlespinasse/github-slug-action@v4
@@ -74,6 +75,7 @@ jobs:
7475
APPIMAGE_APT_ARCH="${TARGETARCH}"
7576
APPIMAGE_APT_DISTRO="${{ matrix.base.codename }}"
7677
APPIMAGE_APT_PUBKEY="${{ matrix.base.pubkey }}"
78+
APPIMAGE_APT_PUBKEY_UPDATES="${{ matrix.base.pubkey_updates }}"
7779
APPIMAGE_APT_PUBKEY_SECURITY="${{ matrix.base.pubkey_security }}"
7880
APPIMAGE_ARCH="${TARGETMACHINE}"
7981
printenv | grep ^APPIMAGE_ >>"${GITHUB_ENV}"
@@ -99,7 +101,7 @@ jobs:
99101
if-no-files-found: error
100102

101103
test:
102-
runs-on: ubuntu-latest
104+
runs-on: ${{ matrix.target.os }}
103105
needs:
104106
- build
105107
strategy:
@@ -108,38 +110,42 @@ jobs:
108110
target:
109111
- platform: linux/amd64
110112
arch: amd64
113+
os: ubuntu-latest
114+
115+
# arm64 AppImages created by appimage-builder <= v1.1.0 are broken
116+
# and fail with `APPRUN_ERROR: No such file or directory` on amd64
117+
# due to https://github.com/AppImageCrafters/appimage-builder/issues/272
118+
#
119+
# This comment can be removed when a fixed appimage-builder release is available.
120+
#- platform: linux/arm64
121+
# arch: arm64
122+
# os: ubuntu-24.04-arm
123+
111124
base:
112125
- os: ubuntu
113126
codename: jammy
114127
- os: ubuntu
115128
codename: noble
116129
- os: debian
117130
codename: bookworm
118-
# ARM64 builds fail for Trixie and F41, something in the dockerfile throws code 139 and it segfaults
119-
# - os: debian
120-
# codename: trixie
121-
# - os: fedora
122-
# codename: "41"
131+
- os: debian
132+
codename: trixie
123133
- os: fedora
124-
codename: "40"
125-
- os: archlinux
126-
codename: base
134+
codename: "41"
135+
- os: fedora
136+
codename: "42"
127137

128138
steps:
129139
- name: Checkout
130-
uses: actions/checkout@v4
140+
uses: actions/checkout@v5
131141

132142
- name: Download artifacts
133-
uses: actions/download-artifact@v4
143+
uses: actions/download-artifact@v5
134144
with:
135145
pattern: appimage-*-${{ matrix.target.arch }}
136146
path: appimages
137147
merge-multiple: true
138148

139-
- name: Setup qemu for docker
140-
uses: docker/setup-qemu-action@v3
141-
if: matrix.target.platform != 'linux/amd64'
142-
143149
- name: Setup buildx for docker
144150
uses: docker/setup-buildx-action@v3
145151

@@ -165,7 +171,7 @@ jobs:
165171

166172
steps:
167173
- name: Download artifacts
168-
uses: actions/download-artifact@v4
174+
uses: actions/download-artifact@v5
169175
with:
170176
pattern: appimage-*
171177
path: assets

AppImageBuilder.debian.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ AppDir:
103103
- sourceline: deb http://deb.debian.org/debian {{APPIMAGE_APT_DISTRO}} main
104104
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x{{APPIMAGE_APT_PUBKEY}}
105105
- sourceline: deb http://deb.debian.org/debian {{APPIMAGE_APT_DISTRO}}-updates main
106+
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x{{APPIMAGE_APT_PUBKEY_UPDATES}}
106107
- sourceline: deb http://deb.debian.org/debian-security/ {{APPIMAGE_APT_DISTRO}}-security main
107108
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x{{APPIMAGE_APT_PUBKEY_SECURITY}}
108109

AppImageBuilder.test.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN <<EOR
2222
elif command -v pacman >/dev/null; then
2323
pacman -Syu --noconfirm libx11
2424
elif command -v dnf >/dev/null; then
25-
dnf list updates && dnf install -y libX11
25+
dnf install -y libX11
2626
fi
2727
}
2828

0 commit comments

Comments
 (0)