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

Issue #6257: Race condition bug in meson build.

Browse source 
Argh! My previous commit logics was right, but should have been applied
to the Windows builds (where the issue happens). That's what happens
when I hack too late at night!
This commit is contained in:
Jehan 2021-05-20 04:32:20 +02:00
parent 11a891b314
commit 9c6776fbe4
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.gitlab-ci.yml
View file

@ -233,13 +233,7 @@ gimp-clang-debian:
clang libomp-dev clang libomp-dev
- meson _build - meson _build
--prefix="${INSTALL_PREFIX}" --prefix="${INSTALL_PREFIX}"
# This is absolute ugly but is the current trick to handle issue - ninja -C _build
# #6257 which is a race condition in the meson build. When we have a
# failure because of this, "git-version.h" will still have been
# created, yet after a depending target is being built. So all we
# have to do is re-run `ninja`. If the second attempt fails too,
# then it's another issue.
- ninja -C _build || ninja -C _build
- ninja -C _build test - ninja -C _build test
## WINDOWS 64-bit CI (native MSYS2) ## ## WINDOWS 64-bit CI (native MSYS2) ##
@ -412,8 +406,14 @@ gimp-win64:
script: script:
- export PATH="`pwd`/.local/bin:$PATH" - export PATH="`pwd`/.local/bin:$PATH"
- mkdir _build && cd _build - mkdir _build && cd _build
# This is absolute ugly but is the current trick to handle issue
# #6257 which is a race condition in the meson build. When we have a
# failure because of this, "git-version.h" will still have been
# created, yet after a depending target is being built. So all we
# have to do is re-run `ninja`. If the second attempt fails too,
# then it's another issue.
- echo 'crossroad meson .. - echo 'crossroad meson ..
-Dgtk-doc=false && ninja install && -Dgtk-doc=false && (ninja || ninja) && ninja install &&
cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/ cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/
' | ' |
crossroad w64 gimp --run="-" crossroad w64 gimp --run="-"
@ -478,7 +478,7 @@ gimp-win32:
- export PATH="`pwd`/.local/bin:$PATH" - export PATH="`pwd`/.local/bin:$PATH"
- mkdir _build && cd _build - mkdir _build && cd _build
- echo 'crossroad meson .. - echo 'crossroad meson ..
-Dwmf=disabled -Dmng=disabled -Dgtk-doc=false && ninja install && -Dwmf=disabled -Dmng=disabled -Dgtk-doc=false && (ninja || ninja) && ninja install &&
cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/ cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/
' | ' |
crossroad w32 gimp --run="-" crossroad w32 gimp --run="-"