Skip to content

Commit 3db518e

Browse files
committed
Follow upstream linuxdeploy project changes
Specifically: * use `i686` instead of `i386` for AppImage plugin; * update alpha version tag names; * drop tests for the discontinued `static-x86_64` binaries. Squashed commit of the following: commit 5f79219 Author: Paul Colby <[email protected]> Date: Fri Feb 14 11:56:06 2025 +1100 Correct workflow syntax commit bb3c24f Author: Paul Colby <[email protected]> Date: Fri Feb 14 11:53:14 2025 +1100 Drop the static-x86_64 arch from CI tests Since linuxdeploy has dropped support for it. commit eae5b3b Author: Paul Colby <[email protected]> Date: Fri Feb 14 11:51:41 2025 +1100 Update SHA sums for latest linuxdeploy releases commit 9eb5bcb Author: Paul Colby <[email protected]> Date: Fri Feb 14 10:58:40 2025 +1100 Map 'i386' to 'i686' for AppImage plugin only No idea why the linuxdeploy project has moved to using 'i686' for just that plugin. Perhaps more will follow. commit 89a89cd Author: Paul Colby <[email protected]> Date: Fri Feb 14 10:50:17 2025 +1100 Need a non-default version for Qt plugin for now Since the latest release does not match linuxdeploy. commit 925f545 Author: Paul Colby <[email protected]> Date: Fri Feb 14 10:40:46 2025 +1100 Follow upstream tag name convention changes
1 parent db87fb2 commit 3db518e

File tree

4 files changed

+22
-14
lines changed

4 files changed

+22
-14
lines changed

.github/workflows/ci.yaml

+9-10
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
arch: i386
5454
dir: ${{ env.INSTALL_DIR }}
5555
install-deps: false
56-
plugins: appimage@1-alpha-20230713-1 qt
56+
plugins: appimage@1-alpha-20250213-1 qt@1-alpha-20250213-1
5757
set-env: false
58-
version: 2.0.0-alpha-1-20241106
58+
version: 1-alpha-20250213-2
5959
- name: Check post-state
6060
run: |
6161
apt list --installed > "${RUNNER_TEMP}/apt.post"
@@ -66,11 +66,11 @@ jobs:
6666
run: |
6767
sha384sum "${INSTALL_DIR}"/*.AppImage # Log the actual checksums for debugging / diagnostics.
6868
sha384sum --check --strict <<--
69-
5b314ddedc5fa78747224e276003f83209232031b402bd72626c468043b5e89c6f2731e6613f2ac7c3284b500076e3ae\
69+
c816c8aa33c5c7fb9a5dbdec50fa0a4546dabfc9397df8e144c1ba38a0158f2962f2d0299ce42b372e0355911e182a52\
7070
${INSTALL_DIR}/linuxdeploy-i386.AppImage
71-
28550e5f1699bc826d645d8f8116575df31d7cc16d2ad566a81d11087695fa1445893c0c3ac464a2cb65808bafdd1acd\
72-
${INSTALL_DIR}/linuxdeploy-plugin-appimage-i386.AppImage
73-
1f34dc368a588286e615b0af719631e31f3a1f1fe8f9f092eda2844723856a25754068c03b7652c55bac3482bc5d0a0d\
71+
625b34c982fbc873cda0282d4d378ea323fd78a48687b6cd5bbe2a11f4c4c1cee5ddfa4f74bf9afb2eb22086bfc58971\
72+
${INSTALL_DIR}/linuxdeploy-plugin-appimage-i686.AppImage
73+
6cc269e593cc5febbeb4af61d2fc288bd59498d39a5a2e56bac2c66b371aadf11d6e057f3a205a42d945b2d87304fe71\
7474
${INSTALL_DIR}/linuxdeploy-plugin-qt-i386.AppImage
7575
-
7676
strategy:
@@ -140,7 +140,7 @@ jobs:
140140
env:
141141
# These should all be the latest official releases, however most (all?) plugins don't have official releases yet.
142142
PLUGINS: >-
143-
appimage@1-alpha-20230713-1
143+
appimage@1-alpha-20250213-1
144144
checkrt@continuous
145145
conda@master
146146
demo@master
@@ -152,7 +152,7 @@ jobs:
152152
native_packages@continuous
153153
ncurses@master
154154
python@continuous
155-
qt@2.0.0-alpha-1-20250119
155+
qt@1-alpha-20250213-1
156156
steps:
157157
- uses: actions/checkout@v4
158158
- name: Filter plugins not supported for this arch
@@ -167,7 +167,7 @@ jobs:
167167
with:
168168
arch: ${{ matrix.arch }}
169169
plugins: ${{ env.PLUGINS }}
170-
- if: matrix.arch == 'aarch64' || endsWith(matrix.arch, 'x86_64')
170+
- if: matrix.arch == 'aarch64' || matrix.arch == 'x86_64'
171171
run: linuxdeploy-${{ matrix.arch }}.AppImage --list-plugins
172172
strategy:
173173
matrix:
@@ -178,6 +178,5 @@ jobs:
178178
- aarch64
179179
- armhf
180180
- i386
181-
- static-x86_64
182181
- x86_64
183182
fail-fast: false

.github/workflows/plugins.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Just a convenient list for CI development.
1111
| [gtk] | *all* (`.sh`) |
1212
| [native_packages] |`x86_64` |
1313
| [ncurses] | *all* (`.sh`) |
14-
| [qt] | `aarch64`, `armhf`, `i386`, `static-x86_64`, `x86_64` |
14+
| [qt] | `aarch64`, `armhf`, `i386`, ~`static-x86_64`,~ `x86_64` |
1515
| *Official Misc Plugins* ||
1616
| [demo] | *all* (`.sh`) |
1717
| [gdb] | *all* (`.sh`) |

CHANGELOG.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changelog
22

3-
## [1.0.1][] (2024-10-21)
3+
## [1.1.0][] (2025-02-14)
4+
5+
Switched to use `i686` for 32-bit [AppImage plugin] binaries, to match upstream [linuxdeploy] project changes.
6+
7+
## [1.0.2][] (2024-10-21)
48

59
Added support for the follow [misc-plugins]:
610

@@ -27,8 +31,11 @@ Initial public release, with full support for installing [linuxdeploy], and the
2731
- `python`
2832
- `qt`
2933

34+
[1.1.0]: https://github.com/pcolby/install-linuxdeploy/releases/tag/v1.1.0
35+
[1.0.2]: https://github.com/pcolby/install-linuxdeploy/releases/tag/v1.0.2
3036
[1.0.1]: https://github.com/pcolby/install-linuxdeploy/releases/tag/v1.0.1
3137
[1.0.0]: https://github.com/pcolby/install-linuxdeploy/releases/tag/v1.0.0
3238

39+
[AppImage plugin]: https://github.com/linuxdeploy/linuxdeploy-plugin-appimage
3340
[linuxdeploy]: https://github.com/linuxdeploy/linuxdeploy
3441
[misc-plugins]: https://github.com/linuxdeploy/misc-plugins

action.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ runs:
5555
)
5656
for plugin in ${INPUTS_PLUGINS}; do
5757
IFS='@' read -r name version <<< "${plugin}"
58-
[[ -v "PLUGIN_FORMAT[${name}]" ]] && urlFormat="${PLUGIN_FORMAT[${name}]}" ||
59-
urlFormat=$(printf "${RELEASE_FORMAT}" linuxdeploy{,-plugin-${name}{,-${ARCH}.AppImage}})
58+
[[ -v "PLUGIN_FORMAT[${name}]" ]] && urlFormat="${PLUGIN_FORMAT[${name}]}" || {
59+
if [[ "${name}" == 'appimage' && "${ARCH}" == 'i386' ]]; then arch='i686'; else arch="${ARCH}"; fi
60+
urlFormat=$(printf "${RELEASE_FORMAT}" linuxdeploy{,-plugin-${name}{,-${arch}.AppImage}})
61+
}
6062
[[ "${urlFormat}" == 'https://raw.'* ]] && : "${version:=master}" || : "${version:=${INPUTS_VERSION}}"
6163
printf -v url "${urlFormat}" "${version}"
6264
binaries+=("${INPUTS_DIR}/${url##*/}")

0 commit comments

Comments
 (0)