[gimp/wip/schumaml/crossraods-optimization: 33/76] try to run crossroad properly




commit 86ce430e2c5bb938e71d021071e6c66bdf698a7d
Author: Michael Schumacher <schumaml gmx de>
Date:   Thu Nov 26 22:31:50 2020 +0100

    try to run crossroad properly

 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11a9be0984..e819f82bb4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,7 +53,7 @@ build-image-win64:
     - echo "RUN pip3 install zstandard" >> Dockerfile
     - echo "RUN git clone --depth=${GIT_DEPTH} git://git.tuxfamily.org/gitroot/crossroad/crossroad.git" >> 
Dockerfile
     - echo "RUN cd crossroad && ./setup.py install --prefix=/usr/local && cd .." >> Dockerfile
-    - echo "RUN PATH=\"/usr/local/bin:$PATH\" crossroad install lcms2 cairo json-glib " >> Dockerfile
+    - echo "RUN echo 'crossroad source msys2 && crossroad install lcms2 cairo json-glib' | crossroad w64 
gimp --run='-'" >> Dockerfile
 
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$CI_REGISTRY_IMAGE:build-win64-latest --cache=true --cache-ttl=120h
 
@@ -201,11 +201,11 @@ deps-win64:
     - git clone --depth 1 https://gitlab.gnome.org/GNOME/babl.git
     - git clone --depth 1 https://gitlab.gnome.org/GNOME/gegl.git
     - cd babl
-    - crossroad meson _build/ -Denable-gir=false -Dlibdir=lib
+    - echo 'crossroad meson _build/ -Denable-gir=false -Dlibdir=lib' | crossroad w64 gimp --run="-"
     - ninja -C _build install
     - cd ..
     - cd gegl
-    - crossroad meson _build/ -Denable-gir=false -Dlibdir=lib
+    - echo 'crossroad meson _build/ -Denable-gir=false -Dlibdir=lib' | crossroad w64 gimp --run="-"
     - ninja -C _build install
     - cd ..
   artifacts:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]