build, gitlab: name artifact folder per arch.

Apparently that is the reason why the Aarch64 jobs are rebuilding
everything, though I'm not sure to understand why (can gimp-flatpak job
grab the deps-flatpak artifacts from the wrong architecture?).
This commit is contained in:
Jehan 2025-12-22 19:01:29 +01:00
parent e1514a6960
commit 73040bcebd
3 changed files with 5 additions and 5 deletions

View file

@ -411,7 +411,7 @@ deps-flatpak:
- sh build/linux/flatpak/1_build-deps-flatpakbuilder.sh
artifacts:
paths:
- flatpak-builder-deps
- flatpak-builder-$RUNNER
- flatpak-builder.log*
- babl-meson-log.xz
- gegl-meson-log.xz

View file

@ -113,6 +113,6 @@ if [ "$GITLAB_CI" ]; then
tar --zstd --xattrs -cf "$dir.tar.zst" "$dir"
rm -fr "$dir"
done
rm -fr flatpak-builder-deps
mv .flatpak-builder flatpak-builder-deps
rm -fr flatpak-builder-$RUNNER
mv .flatpak-builder flatpak-builder-$RUNNER
fi

View file

@ -23,8 +23,8 @@ eval "$(sed -n '/Install part/,/End of check/p' build/linux/flatpak/1_build-deps
if [ "$GITLAB_CI" ]; then
# Extract deps from previous job
for archive in flatpak-builder-deps/*; do
if [ "$archive" != "flatpak-builder-deps/build" ]; then
for archive in flatpak-builder-$RUNNER/*; do
if [ "$archive" != "flatpak-builder-$RUNNER/build" ]; then
tar --zstd -xf "$archive"
fi
done