Skip to content

Commit 425a13c

Browse files
committed
ci(github): update AppImage build dependencies
1 parent 878dbdc commit 425a13c

File tree

4 files changed

+26
-24
lines changed

4 files changed

+26
-24
lines changed

.github/workflows/appimage/Dockerfile

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1-
FROM ubuntu:jammy
1+
FROM ubuntu:noble
2+
3+
# Force older pipx to use global location.
4+
ENV PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin PIPX_MAN_DIR=/usr/local/share/man
25

36
RUN apt-get update -q -y \
4-
# Install appimage-builder and appimagetool dependencies.
7+
# Install appimage-builder and appimagetool dependencies.
58
&& DEBIAN_FRONTEND="noninteractive" apt-get install -q -y --no-install-recommends \
6-
appstream curl desktop-file-utils fakeroot file git gnupg patchelf squashfs-tools zsync \
7-
python3-pip python3-setuptools python3-wheel \
8-
&& \
9+
appstream curl desktop-file-utils fakeroot file git gnupg patchelf pipx squashfs-tools zsync \
910
# Install appimagetool, it has to be extracted because FUSE doesn't work in containers without extra fiddling.
10-
cd /tmp && \
11-
curl -sLO https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage && \
12-
chmod +x appimagetool-x86_64.AppImage && \
13-
./appimagetool-x86_64.AppImage --appimage-extract && \
14-
mv squashfs-root/ /opt/appimagetool.AppDir && \
15-
ln -s /opt/appimagetool.AppDir/AppRun /usr/local/bin/appimagetool && \
16-
rm appimagetool-x86_64.AppImage && \
17-
cd - && \
11+
&& cd /tmp \
12+
&& curl -sLO https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage \
13+
&& chmod +x appimagetool-x86_64.AppImage \
14+
&& ./appimagetool-x86_64.AppImage --appimage-extract \
15+
&& mv squashfs-root/ /opt/appimagetool.AppDir \
16+
&& ln -s /opt/appimagetool.AppDir/AppRun /usr/local/bin/appimagetool \
17+
&& rm appimagetool-x86_64.AppImage \
18+
&& cd - \
1819
# Install appimage-builder.
19-
pip3 install git+https://github.com/AppImageCrafters/appimage-builder.git@669213cb730e007d5b316ed19b39691fbdcd41c4 && \
20-
apt-get clean && \
21-
rm -rf /var/lib/apt/lists/*
20+
&& pipx install git+https://github.com/AppImageCrafters/appimage-builder.git@bf6123ee43715e52d2a73639f9acb1251e8af640 \
21+
&& apt-get clean \
22+
&& rm -rf /var/lib/apt/lists/*
2223

2324
# Set entrypoint.
2425
COPY entrypoint.sh /entrypoint.sh

.github/workflows/build-check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ jobs:
179179
180180
build-appimage:
181181
name: AppImage
182-
runs-on: ubuntu-22.04
182+
runs-on: ubuntu-24.04
183183

184184
steps:
185185
- name: Checkout
@@ -194,7 +194,7 @@ jobs:
194194
apt_dependencies: >-
195195
build-essential
196196
cmake extra-cmake-modules
197-
libappindicator-dev
197+
libappindicator3-dev
198198
libarchive-dev
199199
libqt5x11extras5-dev
200200
libsqlite3-dev

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
9595
build-appimage:
9696
name: AppImage
97-
runs-on: ubuntu-22.04
97+
runs-on: ubuntu-24.04
9898

9999
steps:
100100
- name: Checkout
@@ -109,7 +109,7 @@ jobs:
109109
apt_dependencies: >-
110110
build-essential
111111
cmake extra-cmake-modules
112-
libappindicator-dev
112+
libappindicator3-dev
113113
libarchive-dev
114114
libqt5x11extras5-dev
115115
libsqlite3-dev

pkg/appimage/appimage-amd64.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ AppDir:
2323
apt:
2424
arch: amd64
2525
sources:
26-
- sourceline: deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse
26+
- sourceline: deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse
2727
key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920d1991bc93c
28-
- sourceline: deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse
29-
- sourceline: deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse
28+
- sourceline: deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-updates main restricted universe multiverse
29+
- sourceline: deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse
3030
include:
3131
# Required Qt packages.
3232
- libqt5concurrent5
@@ -73,5 +73,6 @@ AppDir:
7373

7474
AppImage:
7575
arch: x86_64
76-
update-information: gh-releases-zsync|zealdocs|zeal|latest|zeal-*x86_64.AppImage.zsync
76+
comp: xz
7777
sign-key: None
78+
update-information: gh-releases-zsync|zealdocs|zeal|latest|zeal-*x86_64.AppImage.zsync

0 commit comments

Comments
 (0)