procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 01:43:24 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

gitlab-ci, build: Give up of build caching (ccache)

Browse source 
Actually it does more harm than good on CI, causing inconsistency and work.

The plan was to use it in all jobs but it is simply impossible for Flatpak
(https://gitlab.gnome.org/Infrastructure/Infrastructure/-/issues/1502)
and seems that for Crossbuilds too (tested both crossroad and quasi-msys2).
Actually, only Windows jobs can use it, but started to fail on x86 runners.

On the other hand, sometimes the build is faster without ccache and we do
not have the burden of contacting managers etc. Just pkg caching is fine.
This commit is contained in:
Bruno 2025-01-24 11:06:04 -03:00
parent 6e777c861b
commit b51f2b5252
No known key found for this signature in database
3 changed files with 21 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

63
.gitlab-ci.yml
View file

@ -68,14 +68,6 @@ workflow:
- 'scheduler_failure' - 'scheduler_failure'
# Default Docker image (unless otherwise defined) # Default Docker image (unless otherwise defined)
image: debian:${DEB_VERSION} image: debian:${DEB_VERSION}
# Caching support
variables:
CCACHE_BASEDIR: "$CI_PROJECT_DIR"
CCACHE_DIR: "$CI_PROJECT_DIR/_ccache"
cache:
key: ${CI_JOB_NAME_SLUG}${VARIANT}
paths:
- _ccache/
# Common artifacts behavior # Common artifacts behavior
artifacts: artifacts:
name: "${CI_JOB_NAME_SLUG}${VARIANT}-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" name: "${CI_JOB_NAME_SLUG}${VARIANT}-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}"
@ -137,8 +129,8 @@ stages:
variables: {} variables: {}
- if: '$GIMP_CI_MESON_GCC != null' - if: '$GIMP_CI_MESON_GCC != null'
variables: variables:
CC: "ccache cc" CC: "cc"
CXX: "ccache c++" CXX: "c++"
CC_LD: bfd CC_LD: bfd
CXX_LD: bfd CXX_LD: bfd
VARIANT: "-gcc" VARIANT: "-gcc"
@ -163,7 +155,6 @@ image-debian:
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
UMFPACK: libumfpack5 UMFPACK: libumfpack5
cache: []
before_script: [] before_script: []
script: script:
- export container=docker - export container=docker
@ -246,7 +237,6 @@ image-debian-x64:
stage: !reference [image-debian, stage] stage: !reference [image-debian, stage]
image: !reference [image-debian, image] image: !reference [image-debian, image]
variables: !reference [image-debian, variables] variables: !reference [image-debian, variables]
cache: !reference [image-debian, cache]
before_script: before_script:
- !reference [image-debian, before_script] - !reference [image-debian, before_script]
script: script:
@ -260,7 +250,6 @@ deps-debian:
stage: dependencies stage: dependencies
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
CCACHE_MAXSIZE: 0.25G
script: script:
# Clone and build babl # Clone and build babl
- echo -e "\e[0Ksection_start:`date +%s`:babl_build[collapsed=true]\r\e[0KBuilding babl" - echo -e "\e[0Ksection_start:`date +%s`:babl_build[collapsed=true]\r\e[0KBuilding babl"
@ -277,7 +266,6 @@ deps-debian:
- cd _build-${RUNNER} - cd _build-${RUNNER}
- ninja - ninja
- ninja install - ninja install
- ccache --show-stats
- cd ../.. - cd ../..
- echo -e "\e[0Ksection_end:`date +%s`:babl_build\r\e[0K" - echo -e "\e[0Ksection_end:`date +%s`:babl_build\r\e[0K"
# Clone and build gegl # Clone and build gegl
@ -295,7 +283,6 @@ deps-debian:
- cd _build-${RUNNER} - cd _build-${RUNNER}
- ninja - ninja
- ninja install - ninja install
- ccache --show-stats
- echo -e "\e[0Ksection_end:`date +%s`:gegl_build\r\e[0K" - echo -e "\e[0Ksection_end:`date +%s`:gegl_build\r\e[0K"
artifacts: artifacts:
paths: paths:
@ -312,7 +299,6 @@ gimp-debian:
stage: gimp stage: gimp
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
CCACHE_MAXSIZE: 0.75G
script: script:
# Build GIMP # Build GIMP
- echo -e "\e[0Ksection_start:`date +%s`:gimp_build[collapsed=true]\r\e[0KBuilding GIMP" - echo -e "\e[0Ksection_start:`date +%s`:gimp_build[collapsed=true]\r\e[0KBuilding GIMP"
@ -320,7 +306,6 @@ gimp-debian:
-Drelocatable-bundle=yes -Drelocatable-bundle=yes
- cd _build-${RUNNER} - cd _build-${RUNNER}
- ninja - ninja
- ccache --show-stats
- echo -e "\e[0Ksection_end:`date +%s`:gimp_build\r\e[0K" - echo -e "\e[0Ksection_end:`date +%s`:gimp_build\r\e[0K"
# Create bundle # Create bundle
- echo -e "\e[0Ksection_start:`date +%s`:gimp_bundle[collapsed=true]\r\e[0KCreating bundle" - echo -e "\e[0Ksection_start:`date +%s`:gimp_bundle[collapsed=true]\r\e[0KCreating bundle"
@ -357,7 +342,6 @@ gimp-debian-x64:
$MESON_OPTIONS $MESON_OPTIONS
- cd _build-${RUNNER} - cd _build-${RUNNER}
- ninja - ninja
- ccache --show-stats
- echo -e "\e[0Ksection_end:`date +%s`:gimp_build\r\e[0K" - echo -e "\e[0Ksection_end:`date +%s`:gimp_build\r\e[0K"
# Check execution # Check execution
- echo -e "\e[0Ksection_start:`date +%s`:gimp_test[collapsed=true]\r\e[0KTesting GIMP execution" - echo -e "\e[0Ksection_start:`date +%s`:gimp_test[collapsed=true]\r\e[0KTesting GIMP execution"
@ -406,15 +390,11 @@ deps-flatpak-x64:
extends: .flatpak-x64 extends: .flatpak-x64
needs: [] needs: []
stage: dependencies stage: dependencies
# FIXME: GitLab CI caching does NOT work with flatpak #https://gitlab.gnome.org/Infrastructure/Infrastructure/-/issues/1502
# See: https://gitlab.gnome.org/Infrastructure/Infrastructure/-/issues/1502 #cache:
cache: [] #key: ${CI_JOB_NAME_SLUG}
# key: ${CI_JOB_NAME}-pkg #paths:
# paths: #- .flatpak-builder/
# .flatpak-builder/
# key: $CI_JOB_NAME
# paths:
# _ccache/
script: script:
- bash build/linux/flatpak/1_build-deps-flatpak.sh - bash build/linux/flatpak/1_build-deps-flatpak.sh
artifacts: artifacts:
@ -429,12 +409,6 @@ gimp-flatpak-x64:
extends: .flatpak-x64 extends: .flatpak-x64
needs: ["deps-flatpak-x64"] needs: ["deps-flatpak-x64"]
stage: gimp stage: gimp
# FIXME: GitLab CI caching does NOT work with flatpak
# See: https://gitlab.gnome.org/Infrastructure/Infrastructure/-/issues/1502
cache: []
# key: $CI_JOB_NAME
# paths:
# _ccache/
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
script: script:
@ -456,7 +430,6 @@ gimp-flatpak-x64:
variables: variables:
DEB_VERSION: testing DEB_VERSION: testing
MSYSTEM_PREFIX: clang64 MSYSTEM_PREFIX: clang64
cache: []
image-debian-x64-cross: image-debian-x64-cross:
extends: .win-cross extends: .win-cross
@ -465,7 +438,6 @@ image-debian-x64-cross:
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
UMFPACK: libumfpack6 UMFPACK: libumfpack6
cache: !reference [image-debian, cache]
before_script: before_script:
- !reference [image-debian, before_script] - !reference [image-debian, before_script]
script: script:
@ -475,6 +447,11 @@ deps-win-x64-cross:
extends: .win-cross extends: .win-cross
needs: ["image-debian-x64-cross"] needs: ["image-debian-x64-cross"]
stage: dependencies stage: dependencies
#https://gitlab.gnome.org/Infrastructure/Infrastructure/-/issues/1461
#cache:
#key: ${CI_JOB_NAME_SLUG}
#paths:
#- quasi-msys2/
before_script: [] before_script: []
script: script:
- bash build/windows/1_build-deps-quasimsys2.sh - bash build/windows/1_build-deps-quasimsys2.sh
@ -549,8 +526,6 @@ deps-win:
extends: .win extends: .win
needs: [] needs: []
stage: dependencies stage: dependencies
variables:
CCACHE_MAXSIZE: 0.25G
script: script:
- build/windows/1_build-deps-msys2.ps1 - build/windows/1_build-deps-msys2.ps1
artifacts: artifacts:
@ -566,7 +541,6 @@ gimp-win:
stage: gimp stage: gimp
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
CCACHE_MAXSIZE: 0.75G
script: script:
- build/windows/2_build-gimp-msys2.ps1 - build/windows/2_build-gimp-msys2.ps1
artifacts: artifacts:
@ -595,7 +569,6 @@ deps-win-x86:
extends: .win-x86 extends: .win-x86
needs: [] needs: []
stage: !reference [deps-win, stage] stage: !reference [deps-win, stage]
variables: !reference [deps-win, variables]
script: script:
- !reference [deps-win, script] - !reference [deps-win, script]
artifacts: !reference [deps-win, artifacts] artifacts: !reference [deps-win, artifacts]
@ -630,7 +603,7 @@ file-plug-in-tests:
GIMP_TESTS_LOG_FILE: "$CI_PROJECT_DIR/_log/import-tests.log" GIMP_TESTS_LOG_FILE: "$CI_PROJECT_DIR/_log/import-tests.log"
REGRESSION_STRING: "Total number of regressions: 0" REGRESSION_STRING: "Total number of regressions: 0"
cache: cache:
- key: $CI_JOB_NAME key: $CI_JOB_NAME
paths: paths:
- _data - _data
script: script:
@ -663,7 +636,6 @@ clang-format:
- <<: *CI_MERGE - <<: *CI_MERGE
needs: [] needs: []
stage: analysis stage: analysis
cache: []
script: script:
- apt-get update - apt-get update
- apt-get install -y clang-format - apt-get install -y clang-format
@ -683,12 +655,11 @@ cppcheck:
- if: '$GIMP_CI_CPPCHECK != null' - if: '$GIMP_CI_CPPCHECK != null'
needs: [] needs: []
stage: analysis stage: analysis
cache: []
script: script:
- apt-get update - apt-get update
- apt-get install -y cppcheck - apt-get install -y cppcheck
- cppcheck -q -j8 --enable=all --force --output-file=cppcheck.xml --xml --xml-version=2 - cppcheck -q -j8 --enable=all --force --output-file=cppcheck.xml --xml --xml-version=2
-i _build -i _build-cross -i babl -i gegl -i _install -i .local -i .cache -i _ccache -i gimp-x64 . -i _build -i _build-cross -i babl -i gegl -i _install -i .local -i .cache -i gimp-x64 .
- mkdir report - mkdir report
- cppcheck-htmlreport --source-dir=. --title=gimp --file=cppcheck.xml --report-dir=report - cppcheck-htmlreport --source-dir=. --title=gimp --file=cppcheck.xml --report-dir=report
artifacts: artifacts:
@ -707,7 +678,6 @@ sources-debian:
- <<: *CI_RELEASE - <<: *CI_RELEASE
needs: ["gimp-debian-x64"] needs: ["gimp-debian-x64"]
stage: distribution stage: distribution
cache: []
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
script: script:
@ -730,7 +700,6 @@ dev-docs:
- <<: *CI_RELEASE - <<: *CI_RELEASE
needs: ["deps-debian-x64", "gimp-debian-x64"] needs: ["deps-debian-x64", "gimp-debian-x64"]
stage: distribution stage: distribution
cache: []
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
script: script:
@ -786,7 +755,6 @@ dist-appimage-weekly:
- !reference [.debian, rules] - !reference [.debian, rules]
needs: ["gimp-debian"] needs: ["gimp-debian"]
stage: distribution stage: distribution
cache: []
script: script:
- bash build/linux/appimage/3_dist-gimp-goappimage.sh _build-x86_64_v2 - bash build/linux/appimage/3_dist-gimp-goappimage.sh _build-x86_64_v2
artifacts: artifacts:
@ -806,7 +774,6 @@ dist-flatpak-weekly:
- if: '$GIMP_CI_FLATPAK != null' - if: '$GIMP_CI_FLATPAK != null'
needs: ["gimp-flatpak-x64"] needs: ["gimp-flatpak-x64"]
stage: distribution stage: distribution
cache: []
script: script:
- bash build/linux/flatpak/3_dist-gimp-flatpak.sh - bash build/linux/flatpak/3_dist-gimp-flatpak.sh
artifacts: artifacts:
@ -823,7 +790,6 @@ dist-installer-weekly:
stage: distribution stage: distribution
tags: tags:
- windows-aarch64 - windows-aarch64
cache: []
script: script:
- build/windows/installer/3_dist-gimp-inno.ps1 - build/windows/installer/3_dist-gimp-inno.ps1
artifacts: artifacts:
@ -844,7 +810,6 @@ dist-store-weekly:
stage: distribution stage: distribution
tags: tags:
- win32-ps - win32-ps
cache: []
script: script:
- build\windows\store\3_dist-gimp-winsdk.ps1 - build\windows\store\3_dist-gimp-winsdk.ps1
artifacts: artifacts:

5
build/windows/1_build-deps-msys2.ps1
View file

@ -47,6 +47,10 @@ if ("$PSCommandPath" -like "*1_build-deps-msys2.ps1*" -or "$CI_JOB_NAME" -like "
pacman --noconfirm -Suy pacman --noconfirm -Suy
} }
pacman --noconfirm -S --needed (Get-Content build/windows/all-deps-uni.txt).Replace('${MINGW_PACKAGE_PREFIX}',$MINGW_PACKAGE_PREFIX).Replace(' \','') pacman --noconfirm -S --needed (Get-Content build/windows/all-deps-uni.txt).Replace('${MINGW_PACKAGE_PREFIX}',$MINGW_PACKAGE_PREFIX).Replace(' \','')
if ($GITLAB_CI)
{
pacman --noconfirm -R $MINGW_PACKAGE_PREFIX-ccache
}
Write-Output "$([char]27)[0Ksection_end:$(Get-Date -UFormat %s -Millisecond 0):deps_install$([char]13)$([char]27)[0K" Write-Output "$([char]27)[0Ksection_end:$(Get-Date -UFormat %s -Millisecond 0):deps_install$([char]13)$([char]27)[0K"
@ -104,7 +108,6 @@ function self_build ([string]$dep, [string]$option1, [string]$option2)
## We need to manually check failures in pre-7.4 PS ## We need to manually check failures in pre-7.4 PS
exit 1 exit 1
} }
ccache --show-stats
Set-Location ../.. Set-Location ../..
Write-Output "$([char]27)[0Ksection_end:$(Get-Date -UFormat %s -Millisecond 0):${dep}_build$([char]13)$([char]27)[0K" Write-Output "$([char]27)[0Ksection_end:$(Get-Date -UFormat %s -Millisecond 0):${dep}_build$([char]13)$([char]27)[0K"
} }

3
build/windows/2_build-gimp-msys2.ps1
View file

@ -27,7 +27,7 @@ Invoke-Expression ((Get-Content build\windows\1_build-deps-msys2.ps1 | Select-St
if ($GITLAB_CI) if ($GITLAB_CI)
{ {
Invoke-Expression ((Get-Content build\windows\1_build-deps-msys2.ps1 | Select-String 'deps_install\[' -Context 0,6) -replace '> ','') Invoke-Expression ((Get-Content build\windows\1_build-deps-msys2.ps1 | Select-String 'deps_install\[' -Context 0,10) -replace '> ','')
} }
@ -55,7 +55,6 @@ if (-not (Test-Path _build-$MSYSTEM_PREFIX\build.ninja -Type Leaf))
} }
Set-Location _build-$MSYSTEM_PREFIX Set-Location _build-$MSYSTEM_PREFIX
ninja ninja
ccache --show-stats
Write-Output "$([char]27)[0Ksection_end:$(Get-Date -UFormat %s -Millisecond 0):gimp_build$([char]13)$([char]27)[0K" Write-Output "$([char]27)[0Ksection_end:$(Get-Date -UFormat %s -Millisecond 0):gimp_build$([char]13)$([char]27)[0K"