gitlab-ci, build: Logs do not need to be compressed

This reverts 1fcdb724 and 8e6da721, which are inoffensive but inconsistent.
They are added while Jehan's final fix did not landed. Back then, we were
experimenting XZ and other things that we don't use in other parts of the .sh.

So, let's go back to just single tar, since logs are not that big after all.
This commit is contained in:
Bruno Lopes 2025-12-23 15:28:06 -03:00
parent fd4c12e889
commit 89e88cde23
2 changed files with 10 additions and 15 deletions

View file

@ -49,7 +49,7 @@ workflow:
## - Building quality tests (static code analysis)
## - Execution tests (dynamic code analysis)
## - Source tarball
## - Developer documentation
## - Developer documentation
.pipeline_commit: &CI_COMMIT
if: '$CI_PIPELINE_SOURCE == "push" && $CI_OPEN_MERGE_REQUESTS == null && $CI_COMMIT_TAG == null'
interruptible: true
@ -59,7 +59,7 @@ workflow:
## - Source tarball
## - Developer documentation
## - Linux .appimage
## - Inno Windows installer
## - Inno Windows installer
## - MS Store .msixupload
.pipeline_release: &CI_RELEASE
if: '$CI_COMMIT_TAG != null'
@ -344,7 +344,7 @@ deps-debian:
PKGCONF_RELOCATABLE_OPTION: '-Dpkgconfig.relocatable=true'
script:
- !reference [deps-debian-nonreloc, script]
artifacts: !reference [deps-debian-nonreloc, artifacts]
artifacts: !reference [deps-debian-nonreloc, artifacts]
gimp-debian:
extends: .debian
@ -412,9 +412,9 @@ deps-flatpak:
artifacts:
paths:
- flatpak-builder-$RUNNER
- flatpak-builder.log*
- babl-meson-log.xz
- gegl-meson-log.xz
- flatpak-builder.log
- babl-meson-log.tar
- gegl-meson-log.tar
expire_in: 2 hours
gimp-flatpak:
@ -563,7 +563,7 @@ gimp-snap:
before_script:
- $GIMP_PREFIX = "$PWD\_install-$(if (-not $env:MSYSTEM_PREFIX) { $(((Get-WmiObject Win32_ComputerSystem).SystemType).Split('-')[0].Trim().ToLower()) } else { $env:MSYSTEM_PREFIX })"
- if ("$VARIANT" -eq '-msvc') { if (-not (Test-Path $env:VCPKG_ROOT)) { git clone --depth 1 https://github.com/microsoft/vcpkg; .\vcpkg\bootstrap-vcpkg.bat }; pip install meson }
- if ("$VARIANT" -eq '-msvc') { $VSINSTALLDIR = $(vswhere -products * -latest -property installationPath); Import-Module "$VSINSTALLDIR\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"; Enter-VsDevShell -VsInstallPath "$VSINSTALLDIR" -SkipAutomaticLocation -DevCmdArguments "-arch=$(((Get-WmiObject Win32_ComputerSystem).SystemType).Split('-')[0].Trim().ToLower())" }
- if ("$VARIANT" -eq '-msvc') { $VSINSTALLDIR = $(vswhere -products * -latest -property installationPath); Import-Module "$VSINSTALLDIR\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"; Enter-VsDevShell -VsInstallPath "$VSINSTALLDIR" -SkipAutomaticLocation -DevCmdArguments "-arch=$(((Get-WmiObject Win32_ComputerSystem).SystemType).Split('-')[0].Trim().ToLower())" }
timeout: 120m
.win_environ: &WIN_ENVIRON

View file

@ -57,7 +57,7 @@ if [ "$CI_PIPELINE_SOURCE" = 'schedule' ]; then
printf "\033[31m(ERROR)\033[0m: Some dependencies sources are outdated. Please, update them on the manifest.\n"
exit 1
else
printf "(INFO): All dependencies sources are up to date. Building them...\n"
printf "(INFO): All dependencies sources are up to date. Building them...\n"
fi
fi
if [ "$GITLAB_CI" ]; then
@ -65,13 +65,8 @@ if [ "$GITLAB_CI" ]; then
oras pull $built_deps_image && oras logout quay.io || true
tar --zstd --xattrs -xf _build-$RUNNER.tar.zst || true
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/ -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
@ -84,7 +79,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
xz --keep --stdout .flatpak-builder/build/babl-1/_flatpak_build/meson-logs/meson-log.txt > babl-meson-log.xz
tar cf babl-meson-log.tar .flatpak-builder/build/babl-1/_flatpak_build/meson-logs/meson-log.txt
fi
printf "\e[0Ksection_end:`date +%s`:babl_build\r\e[0K\n"
@ -92,7 +87,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
xz --keep --stdout .flatpak-builder/build/gegl-1/_flatpak_build/meson-logs/meson-log.txt > gegl-meson-log.xz
tar cf gegl-meson-log.tar .flatpak-builder/build/gegl-1/_flatpak_build/meson-logs/meson-log.txt
# Only keep the build directories long enough to keep a copy of meson
# logs for babl and GEGL.
rm -fr .flatpak-builder/build/*