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: Remove extra ninja call in crossroads Win builds

Browse source 
This workaround was placed to mitigate race condition.
It was useful for the time being, but not anymore.
Better solution will be introduced in following commit.

Reverting changes introduced in 9c6776fb.
This commit is contained in:
Stanislav Grinkov 2021-09-29 00:17:19 +06:00
parent 48ee6a1a72
commit dd02503cf8
No known key found for this signature in database
GPG key ID: F9FF16FBCBF58578
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -486,14 +486,8 @@ gimp-win64:
script:
- export PATH="`pwd`/.local/bin:$PATH"
- 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 ..
-Dgtk-doc=false && (ninja || ninja) && ninja install &&
-Dgtk-doc=false && ninja && ninja install &&
cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/
' |
crossroad w64 gimp --run="-"
@ -558,7 +552,7 @@ gimp-win32:
- export PATH="`pwd`/.local/bin:$PATH"
- mkdir _build && cd _build
- echo 'crossroad meson ..
-Dwmf=disabled -Dmng=disabled -Dgtk-doc=false && (ninja || ninja) && ninja install &&
-Dwmf=disabled -Dmng=disabled -Dgtk-doc=false && ninja && ninja install &&
cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/
' |
crossroad w32 gimp --run="-"