[gimp/wip/sgrinkov/6257-meson-race-rc-win-build: 9/10] gitlab-ci: Remove extra ninja call on win-build

[Stanislav Grinkov <sgrinkov src gnome org>]

commit 93a7b0003dc5db1dd26b66634689bec179381f5a
Author: Stanislav Grinkov <43956-stanislavgrinkov users noreply gitlab gnome org>
Date:   Wed Sep 29 00:17:19 2021 +0600

    gitlab-ci: Remove extra ninja call on win-build
    
    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 8322f31146..597f424f62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -483,14 +483,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="-"
@@ -555,7 +549,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="-"