Skip to content

Commit ae8d90d

Browse files
committed
fix(linux-ci): bust stale linux cache and wipe app build dir on path mismatch
The actions/cache archive from the old qtfin workspace name preserved absolute paths inside build/linux-release, so meson and CMake both resurrect references to /home/runner/work/qtfin/qtfin/... after restore. Bumping the cache key prefix to linux2- forces a clean cache, and the app build dir now gets wiped if CMakeCache points at a different source root.
1 parent ae9ad00 commit ae8d90d

26 files changed

Lines changed: 81 additions & 2 deletions

File tree

‎.github/workflows/build-artifacts.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ jobs:
114114
.ccache
115115
build/linux-release
116116
build/appimage
117-
key: linux-${{ runner.os }}-${{ hashFiles('mpv/meson.build', 'tools/build-linux-release.sh', 'CMakeLists.txt') }}
117+
key: linux2-${{ runner.os }}-${{ hashFiles('mpv/meson.build', 'tools/build-linux-release.sh', 'CMakeLists.txt') }}
118118
restore-keys: |
119-
linux-${{ runner.os }}-
119+
linux2-${{ runner.os }}-
120120
121121
- name: Build host app
122122
run: nix develop -c bash tools/build-linux-release.sh
77.4 MB
Binary file not shown.

‎squashfs-root/.DirIcon‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
linuxdeploy.png

‎squashfs-root/AppRun‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/bin/linuxdeploy

‎squashfs-root/linuxdeploy.desktop‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/share/applications/linuxdeploy.desktop

‎squashfs-root/linuxdeploy.png‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/share/icons/hicolor/64x64/apps/linuxdeploy.png
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/share/icons/hicolor/128x128/apps/appimagetool.png
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#! /bin/sh
2+
3+
set -e
4+
5+
this_dir="$(dirname -- "$(readlink -f -- "$0")")"
6+
7+
# make appimagetool prefer the bundled mksquashfs
8+
export PATH="$this_dir"/usr/bin:"$PATH"
9+
10+
exec "$this_dir"/usr/bin/appimagetool "$@"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/share/applications/appimagetool.desktop
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/share/icons/hicolor/128x128/apps/appimagetool.png

0 commit comments

Comments
 (0)