Fimeg/souveraine
Watch
1
0
Fork
You've already forked souveraine
 0
Code Releases Activity

ci: preserve the staged shell archive

Browse source 
The package step erased its own input before the first copy. Keep the real zstd archive outside scratch and extract its single top-level tree.
This commit is contained in:
Fimeg 2026-08-20 15:42:40 -04:00
commit 7e6633a290
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitea/workflows/ci.yml
View file

@ -397,12 +397,12 @@ jobs:
# scratch HOME and tar the result dereferenced, so the package is # scratch HOME and tar the result dereferenced, so the package is
# self-contained real files and never ships dangling links. # self-contained real files and never ships dangling links.
SHELL_STAGE="$GITHUB_WORKSPACE/shell-stage" SHELL_STAGE="$GITHUB_WORKSPACE/shell-stage"
SHELL_TAR="$GITHUB_WORKSPACE/pacman-package/shell" SHELL_TAR="$GITHUB_WORKSPACE/shell-package-input"
rm -rf "$SHELL_STAGE" "$SHELL_TAR" rm -rf "$SHELL_STAGE" "$SHELL_TAR"
mkdir -p "$SHELL_STAGE" "$SHELL_TAR" mkdir -p "$SHELL_STAGE" "$SHELL_TAR"
HOME="$SHELL_STAGE" ./surfaces/quickshell/deploy.sh HOME="$SHELL_STAGE" ./surfaces/quickshell/deploy.sh
test -L "$SHELL_STAGE/.config/quickshell/souveraine/shell.qml" test -L "$SHELL_STAGE/.config/quickshell/souveraine/shell.qml"
tar -h -C "$SHELL_STAGE/.config/quickshell" -cJf "$SHELL_TAR/souveraine-shell-config.tar.zst" souveraine tar -h --zstd -C "$SHELL_STAGE/.config/quickshell" -cf "$SHELL_TAR/souveraine-shell-config.tar.zst" souveraine
tar -tf "$SHELL_TAR/souveraine-shell-config.tar.zst" | grep -qx 'souveraine/shell.qml' tar -tf "$SHELL_TAR/souveraine-shell-config.tar.zst" | grep -qx 'souveraine/shell.qml'
- name: Package and sign pacman repository - name: Package and sign pacman repository
@ -515,7 +515,7 @@ jobs:
# the staged tar. Same per-arch database as the binaries above. # the staged tar. Same per-arch database as the binaries above.
SHELL_WORK="$WORK/shell-$ARCH" SHELL_WORK="$WORK/shell-$ARCH"
mkdir -p "$SHELL_WORK" mkdir -p "$SHELL_WORK"
cp "$WORK/shell/souveraine-shell-config.tar.zst" "$SHELL_WORK/" cp "$GITHUB_WORKSPACE/shell-package-input/souveraine-shell-config.tar.zst" "$SHELL_WORK/"
cp packaging/arch/PKGBUILD.shell.prebuilt "$SHELL_WORK/PKGBUILD" cp packaging/arch/PKGBUILD.shell.prebuilt "$SHELL_WORK/PKGBUILD"
cp LICENSE "$SHELL_WORK/" cp LICENSE "$SHELL_WORK/"
( (

6
packaging/arch/PKGBUILD.shell.prebuilt
View file

@ -18,8 +18,8 @@ options=('!debug')
source=('souveraine-shell-config.tar.zst' 'LICENSE') source=('souveraine-shell-config.tar.zst' 'LICENSE')
b2sums=('SKIP' 'SKIP') b2sums=('SKIP' 'SKIP')
package() { package() {
install -d "$pkgdir/etc/xdg/quickshell/souveraine" install -d "$pkgdir/etc/xdg/quickshell"
tar -xzf "$srcdir/souveraine-shell-config.tar.zst" \ bsdtar -xf "$srcdir/souveraine-shell-config.tar.zst" \
-C "$pkgdir/etc/xdg/quickshell/souveraine" -C "$pkgdir/etc/xdg/quickshell"
install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
} }