From dd02503cf86da3a8b581a65ca43720f42edea41d Mon Sep 17 00:00:00 2001
From: Stanislav Grinkov
 <43956-stanislavgrinkov@users.noreply.gitlab.gnome.org>
Date: Wed, 29 Sep 2021 00:17:19 +0600
Subject: [PATCH] gitlab-ci: Remove extra ninja call in crossroads Win builds

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.
---
 .gitlab-ci.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 424cda0e48..dd3bebf977 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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="-"