From f2cd68181f57295453fa74f2b6fb758ea344ea9f Mon Sep 17 00:00:00 2001 From: Bruno Lopes Date: Fri, 26 Dec 2025 18:57:07 -0300 Subject: [PATCH] build/linux: Do not tar logs at all on Flatpak jobs Better approach to 89e88cde So, we will not either compress nor tar the logs in the end. As per Jehan comments (I think I've seen something on some MR), we can bypass the GitLab limitations just by cp-ing the logs. --- .gitlab-ci.yml | 6 +++--- build/linux/flatpak/1_build-deps-flatpakbuilder.sh | 4 ++-- build/linux/flatpak/2_build-gimp-flatpakbuilder.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6a56a28e6..18e96637ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -415,8 +415,8 @@ deps-flatpak: paths: - _build-$RUNNER - flatpak-builder.log - - babl-meson-log.tar - - gegl-meson-log.tar + - babl-meson-log.txt + - gegl-meson-log.txt expire_in: 2 hours gimp-flatpak: @@ -432,7 +432,7 @@ gimp-flatpak: - temp*.flatpak - repo*.tar - gimp-flatpak-builder.log - - gimp-meson-log.tar + - gimp-meson-log.txt expire_in: 2 days diff --git a/build/linux/flatpak/1_build-deps-flatpakbuilder.sh b/build/linux/flatpak/1_build-deps-flatpakbuilder.sh index 0ca32d4d1a..06856d17bf 100644 --- a/build/linux/flatpak/1_build-deps-flatpakbuilder.sh +++ b/build/linux/flatpak/1_build-deps-flatpakbuilder.sh @@ -78,7 +78,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 cf babl-meson-log.tar .flatpak-builder/build/babl-1/_flatpak_build/meson-logs/meson-log.txt + cp .flatpak-builder/build/babl-1/_flatpak_build/meson-logs/meson-log.txt babl-meson-log.txt fi printf "\e[0Ksection_end:`date +%s`:babl_build\r\e[0K\n" @@ -86,7 +86,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 cf gegl-meson-log.tar .flatpak-builder/build/gegl-1/_flatpak_build/meson-logs/meson-log.txt + cp .flatpak-builder/build/gegl-1/_flatpak_build/meson-logs/meson-log.txt gegl-meson-log.txt printf "\e[0Ksection_end:`date +%s`:gegl_build\r\e[0K\n" ## Save built deps for 'gimp-flatpak' job ## diff --git a/build/linux/flatpak/2_build-gimp-flatpakbuilder.sh b/build/linux/flatpak/2_build-gimp-flatpakbuilder.sh index 1806076bce..b2ee7847b8 100644 --- a/build/linux/flatpak/2_build-gimp-flatpakbuilder.sh +++ b/build/linux/flatpak/2_build-gimp-flatpakbuilder.sh @@ -41,7 +41,7 @@ printf "\e[0Ksection_start:`date +%s`:gimp_build[collapsed=true]\r\e[0KBuilding eval $FLATPAK_BUILDER --force-clean --disable-rofiles-fuse --keep-build-dirs --build-only --disable-download \ "$GIMP_PREFIX" build/linux/flatpak/org.gimp.GIMP-nightly.json > gimp-flatpak-builder.log 2>&1 || { cat gimp-flatpak-builder.log; exit 1; } if [ "$GITLAB_CI" ]; then - tar cf gimp-meson-log.tar .flatpak-builder/build/gimp-1/_flatpak_build/meson-logs/meson-log.txt + cp .flatpak-builder/build/gimp-1/_flatpak_build/meson-logs/meson-log.txt gimp-meson-log.txt fi printf "\e[0Ksection_end:`date +%s`:gimp_build\r\e[0K\n"