mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-10-06 01:12:40 +02:00
build, gitlab-ci: Drop last ccache shenanigans
Let's prioritize reproducibility over small performance gains, specially when we have too many packages do deal with.
This commit is contained in:
@@ -159,7 +159,6 @@ deps-debian:
|
||||
- echo "RUN apt-get install -qq -y --no-install-recommends \\" >> Dockerfile
|
||||
- echo "appstream
|
||||
bison
|
||||
ccache
|
||||
clang
|
||||
desktop-file-utils
|
||||
flex
|
||||
|
@@ -44,11 +44,6 @@ fi
|
||||
if [ -z "$GIMP_PREFIX" ]; then
|
||||
export GIMP_PREFIX="$PWD/../_install"
|
||||
fi
|
||||
if [ -z "$GITLAB_CI" ]; then
|
||||
BUILDER_ARGS='--ccache --state-dir=../.flatpak-builder'
|
||||
else
|
||||
BUILDER_ARGS='--disable-rofiles-fuse'
|
||||
fi
|
||||
|
||||
|
||||
# Build some deps (including babl and GEGL)
|
||||
@@ -67,12 +62,12 @@ if [ "$CI_PIPELINE_SOURCE" = 'schedule' ]; then
|
||||
fi
|
||||
## (The deps building is too long and no complete output would be collected,
|
||||
## even from GitLab runner messages. So, let's silent and save logs as a file.)
|
||||
eval $FLATPAK_BUILDER --force-clean $BUILDER_ARGS --keep-build-dirs --build-only --stop-at=babl \
|
||||
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
|
||||
printf "\e[0Ksection_end:`date +%s`:deps_build\r\e[0K\n"
|
||||
|
||||
printf "\e[0Ksection_start:`date +%s`:babl_build[collapsed=true]\r\e[0KBuilding babl\n"
|
||||
eval $FLATPAK_BUILDER --force-clean $BUILDER_ARGS --keep-build-dirs --build-only --stop-at=gegl \
|
||||
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
|
||||
@@ -80,7 +75,7 @@ fi
|
||||
printf "\e[0Ksection_end:`date +%s`:babl_build\r\e[0K\n"
|
||||
|
||||
printf "\e[0Ksection_start:`date +%s`:gegl_build[collapsed=true]\r\e[0KBuilding gegl\n"
|
||||
eval $FLATPAK_BUILDER --force-clean $BUILDER_ARGS --keep-build-dirs --build-only --stop-at=gimp \
|
||||
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
|
||||
|
@@ -31,16 +31,11 @@ fi
|
||||
if [ -z "$GIMP_PREFIX" ]; then
|
||||
export GIMP_PREFIX="$PWD/../_install"
|
||||
fi
|
||||
if [ -z "$GITLAB_CI" ]; then
|
||||
BUILDER_ARGS='--ccache --state-dir=../.flatpak-builder'
|
||||
else
|
||||
BUILDER_ARGS='--disable-rofiles-fuse'
|
||||
fi
|
||||
|
||||
|
||||
# Build GIMP only
|
||||
printf "\e[0Ksection_start:`date +%s`:gimp_build[collapsed=true]\r\e[0KBuilding GIMP\n"
|
||||
eval $FLATPAK_BUILDER --force-clean $BUILDER_ARGS --keep-build-dirs --build-only --disable-download \
|
||||
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
|
||||
@@ -51,7 +46,7 @@ printf "\e[0Ksection_end:`date +%s`:gimp_build\r\e[0K\n"
|
||||
# Cleanup GIMP_PREFIX (not working) and export it to OSTree repo
|
||||
# https://github.com/flatpak/flatpak-builder/issues/14
|
||||
printf "\e[0Ksection_start:`date +%s`:gimp_bundle[collapsed=true]\r\e[0KCreating OSTree repo\n"
|
||||
eval $FLATPAK_BUILDER $BUILDER_ARGS --finish-only --repo=repo \
|
||||
eval $FLATPAK_BUILDER --disable-rofiles-fuse --finish-only --repo=repo \
|
||||
"$GIMP_PREFIX" build/linux/flatpak/org.gimp.GIMP-nightly.json
|
||||
if [ "$GITLAB_CI" ]; then
|
||||
tar cf repo-$(uname -m).tar repo/
|
||||
|
@@ -7,8 +7,6 @@
|
||||
"command": "gimp",
|
||||
"build-options": {
|
||||
"env": {
|
||||
"CC": "ccache cc",
|
||||
"CXX": "ccache c++",
|
||||
"CLICOLOR_FORCE": "1"
|
||||
},
|
||||
"cflags": "-fdiagnostics-color=always",
|
||||
@@ -524,8 +522,6 @@
|
||||
"subdir": "source",
|
||||
"buildsystem": "cmake-ninja",
|
||||
"config-opts": [
|
||||
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
|
||||
"-DCMAKE_CXX_COMPILER=c++",
|
||||
"-DCMAKE_INSTALL_PREFIX=/app/lib/libheif",
|
||||
"-DEXTRA_LIB='libx265-10.a;libx265-12.a'",
|
||||
"-DEXTRA_LINK_FLAGS=-L/app/lib/libheif/lib",
|
||||
@@ -799,10 +795,6 @@
|
||||
],
|
||||
"buildsystem": "cmake-ninja",
|
||||
"config-opts": [
|
||||
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
|
||||
"-DCMAKE_C_COMPILER=cc",
|
||||
"-DCMAKE_Fortran_COMPILER_LAUNCHER=ccache",
|
||||
"-DCMAKE_Fortran_COMPILER=gfortran",
|
||||
"-DBUILD_SHARED_LIBS=ON",
|
||||
"-DDYNAMIC_ARCH=ON",
|
||||
"-DUSE_OPENMP=ON",
|
||||
|
@@ -1,5 +1,4 @@
|
||||
${MINGW_PACKAGE_PREFIX}-binutils \
|
||||
${MINGW_PACKAGE_PREFIX}-ccache \
|
||||
${MINGW_PACKAGE_PREFIX}-gi-docgen \
|
||||
${MINGW_PACKAGE_PREFIX}-gobject-introspection \
|
||||
${MINGW_PACKAGE_PREFIX}-headers-git \
|
||||
|
Reference in New Issue
Block a user