dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: no need to tar single files, just compress with xz directly.

Browse source
This commit is contained in:
Jehan 2025-12-14 18:15:48 +01:00
parent 06a2999711
commit 8e6da72132
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -412,9 +412,9 @@ deps-flatpak:
artifacts:
paths:
- _build-$RUNNER.tar.zst
- flatpak-builder.log
- babl-meson-log.tar.xz
- gegl-meson-log.tar.xz
- flatpak-builder.log*
- babl-meson-log.xz
- gegl-meson-log.xz
expire_in: 2 hours
gimp-flatpak:

8
build/linux/flatpak/1_build-deps-flatpakbuilder.sh
View file

@ -67,6 +67,10 @@ if [ "$GITLAB_CI" ]; then
fi
eval $FLATPAK_BUILDER --force-clean --disable-rofiles-fuse --keep-build-dirs --build-only --stop-at=babl \
"$GIMP_PREFIX" build/linux/flatpak/org.gimp.GIMP-nightly.json > flatpak-builder.log 2>&1
if [ "$GITLAB_CI" ]; then
xz flatpak-builder.log
fi
if [ "$GITLAB_CI" ] && [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then
tar --zstd --xattrs --exclude=.flatpak-builder/build/babl-1 --exclude=.flatpak-builder/build/gegl-1 -cf _build-$RUNNER.tar.zst .flatpak-builder/
cat $NIGHTLY_CACHE_ORAS_TOKEN_FILE | oras login -u "${NIGHTLY_CACHE_ORAS_USER}" --password-stdin quay.io || true
@ -79,7 +83,7 @@ printf "\e[0Ksection_start:`date +%s`:babl_build[collapsed=true]\r\e[0KBuilding
eval $FLATPAK_BUILDER --force-clean --disable-rofiles-fuse --keep-build-dirs --build-only --stop-at=gegl \
"$GIMP_PREFIX" build/linux/flatpak/org.gimp.GIMP-nightly.json
if [ "$GITLAB_CI" ]; then
tar cJf babl-meson-log.tar.xz .flatpak-builder/build/babl-1/_flatpak_build/meson-logs/meson-log.txt
xz --keep --stdout .flatpak-builder/build/babl-1/_flatpak_build/meson-logs/meson-log.txt > babl-meson-log.xz
fi
printf "\e[0Ksection_end:`date +%s`:babl_build\r\e[0K\n"
@ -87,7 +91,7 @@ printf "\e[0Ksection_start:`date +%s`:gegl_build[collapsed=true]\r\e[0KBuilding
eval $FLATPAK_BUILDER --force-clean --disable-rofiles-fuse --keep-build-dirs --build-only --stop-at=gimp \
"$GIMP_PREFIX" build/linux/flatpak/org.gimp.GIMP-nightly.json
if [ "$GITLAB_CI" ]; then
tar cJf gegl-meson-log.tar.xz .flatpak-builder/build/gegl-1/_flatpak_build/meson-logs/meson-log.txt
xz --keep --stdout .flatpak-builder/build/gegl-1/_flatpak_build/meson-logs/meson-log.txt > gegl-meson-log.xz
printf "\e[0Ksection_end:`date +%s`:gegl_build\r\e[0K\n"
## Save built deps for 'gimp-flatpak' job