procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

gitlab-ci, build: BUILD_TYPE not set for packaging-win-a64 job.

Browse source 
Aaaargh! I think this was the main issue which would explain why the problem was
mostly happening on the packaging job. In this job, we were still consistently
calling `pacman --noconfirm -Suy` (i.e.g "Synchronizing package databases")
which we had stopped to do for the CI builds as that was highly increasing
chances of locking pacman's process.
This commit is contained in:
Jehan 2024-02-08 19:26:21 +01:00
parent a3d8f65946
commit 979900fcdf
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci.yml
View file

@ -753,6 +753,7 @@ packaging-win-a64:
- if: '$CI_MERGE_REQUEST_LABELS =~ /.*5. Windows Installer.*/' - if: '$CI_MERGE_REQUEST_LABELS =~ /.*5. Windows Installer.*/'
stage: packaging stage: packaging
variables: variables:
BUILD_TYPE: "CI_NATIVE"
MSYSTEM: "CLANGARM64" MSYSTEM: "CLANGARM64"
CHERE_INVOKING: "yes" CHERE_INVOKING: "yes"
tags: tags:

2
build/windows/gitlab-ci/3_package-gimp-uni_base.sh
View file

@ -19,7 +19,7 @@ else # [[ "$CROSSROAD_PLATFORM" == "w32" ]] || [[ "$MSYSTEM_CARCH" == "i686" ]];
fi fi
if [[ "$BUILD_TYPE" != "CI_CROSS" ]] && [[ "$BUILD_TYPE" != "CI_NATIVE" ]]; then if [[ "$BUILD_TYPE" != "CI_CROSS" ]] && [[ "$BUILD_TYPE" != "CI_NATIVE" ]]; then
pacman --noconfirm -Suy pacman --noconfirm -Suy
fi fi