[gimp/wip/schumaml/crossraods-optimization: 253/311] install crossroad to /usr/local




commit f77b207b1dc2d6c8b9a94b4c699b781b67242990
Author: Michael Schumacher <schumaml gmx de>
Date:   Thu Nov 26 21:44:56 2020 +0100

    install crossroad to /usr/local

 .gitlab-ci.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8bd7fb8fb7..ca3d4f24e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,8 @@ build-image-win64:
     # install crossroad
     - 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=`pwd`/../.local" >> 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
 
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$CI_REGISTRY_IMAGE:build-win64-latest --cache=true --cache-ttl=120h
 
@@ -194,8 +195,19 @@ deps-win64:
     - apt-cache
   before_script:
   script:
-    - export PATH="`pwd`/.local/bin:$PATH"
-    - crossroad w64 gimp --run="build/windows/crossbuild-gitlab-ci/build-deps.sh"
+    - export PATH="/usr/local/bin:$PATH"
+    #    - crossroad w64 gimp --run="build/windows/crossbuild-gitlab-ci/build-deps.sh"
+    - mkdir _deps && cd _deps
+    - 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
+    - ninja -C _build install
+    - cd ..
+    - cd gegl
+    - crossroad meson _build/ -Denable-gir=false -Dlibdir=lib
+    - ninja -C _build install
+    - cd ..
   artifacts:
     name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
     when: always


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