[gimp/wip/schumaml/crossraods-optimization: 43/76] gitlab-ci: install crossroad in win32 prepare step & install babl and gegl to .local
- From: Michael Schumacher <schumaml src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/schumaml/crossraods-optimization: 43/76] gitlab-ci: install crossroad in win32 prepare step & install babl and gegl to .local
- Date: Sun, 6 Dec 2020 00:44:39 +0000 (UTC)
commit 3da9c9849d2dba800d4b3312799ce082e89f503b
Author: Michael Schumacher <schumaml gmx de>
Date: Tue Dec 1 20:04:52 2020 +0100
gitlab-ci: install crossroad in win32 prepare step & install babl and gegl to .local
.gitlab-ci.yml | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a682795da5..7bad8a822c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,6 +77,15 @@ build-image-win32:
- echo "RUN apt-get install -y --no-install-recommends \\" >> Dockerfile
- echo "build-essential cpio g++-mingw-w64-i686 gcc-mingw-w64-i686 git intltool libgdk-pixbuf2.0-dev
libglib2.0-bin meson pkg-config python3 python3-distutils python3-docutils python3-pip rpm xsltproc" >>
Dockerfile
+ # 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=/usr/local && cd .." >> Dockerfile
+ # install babl and GEGL dependencies with crossroad
+ - echo "RUN echo 'export XDG_DATA_HOME=/usr/local/lib && crossroad source msys2 && crossroad install
lcms2 cairo json-glib' | XDG_DATA_HOME=/usr/local/lib crossroad w64 gimp --run='-'" >> Dockerfile
+ # install GIMP dependencies with crossroad
+ - echo "RUN echo 'export XDG_DATA_HOME=/usr/local/lib && crossroad source msys2 && crossroad install
appstream-glib atk drmingw gexiv2 glib2 json-c ghostscript iso-codes libheif libmng libmypaint
mypaint-brushes libwebp libwmf openexr ilmbase poppler poppler-data xpm-nox' | XDG_DATA_HOME=/usr/local/lib
crossroad w64 gimp --run='-'" >> Dockerfile
+
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination
$CI_REGISTRY_IMAGE:build-win32-latest --cache=true --cache-ttl=120h
@@ -192,6 +201,7 @@ deps-win64:
variables:
XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
XDG_DATA_HOME: "/usr/local/lib/"
+ PREFIX: "$CI_PROJECT_DIR/.local/"
cache:
paths:
- .cache/crossroad/
@@ -204,11 +214,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
- - echo 'crossroad meson _build/ -Denable-gir=false -Dlibdir=lib' | crossroad w64 gimp --run="-"
+ - echo "crossroad meson _build/ -Denable-gir=false -Dlibdir=lib -Dprefix=$PREFIX" | crossroad w64 gimp
--run="-"
- echo 'ninja -C _build install' | crossroad w64 gimp --run="-"
- cd ..
- cd gegl
- - echo 'crossroad meson _build/ -Dintrospection=false -Dsdl2=disabled -Dlibdir=lib' | crossroad w64 gimp
--run="-"
+ - echo "crossroad meson _build/ -Dintrospection=false -Dsdl2=disabled -Dlibdir=lib' -Dprefix=$PREFIX" |
crossroad w64 gimp --run="-"
- echo 'ninja -C _build install' | crossroad w64 gimp --run="-"
- cd ..
artifacts:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]