[gimp/wip/schumaml/add-ci-prepare-stage] build: prepare custom CI image for win32 build



commit e386a12e43afd19ef4f4738abc12460fb727d129
Author: Michael Schumacher <schumaml gmx de>
Date:   Fri May 29 18:38:22 2020 +0200

    build: prepare custom CI image for win32 build

 .gitlab-ci.yml | 53 ++++++++++++++++++++++-------------------------------
 1 file changed, 22 insertions(+), 31 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dffdcd78d3..e4aa6b688f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,6 +51,26 @@ build-image-win64:
 
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$CI_REGISTRY_IMAGE:build-win64-latest --cache=true --cache-ttl=120h
 
+
+build-image-win32:
+  stage: prepare
+  variables:
+    GIT_STRATEGY: none
+  cache: {}
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
+  script:
+    - mkdir -p /kaniko/.docker
+    - echo 
"{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" 
/kaniko/.docker/config.json
+    - echo "FROM debian:testing" > Dockerfile
+    - echo "RUN apt-get update" >> Dockerfile
+    - 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
+
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$CI_REGISTRY_IMAGE:build-win32-latest --cache=true --cache-ttl=120h
+
+
 ## GNU/Linux 64-bit CIs ##
 
 deps-debian/testing:
@@ -216,6 +236,7 @@ gimp-win64:
 
 deps-win32:
   stage: dependencies
+  image: $CI_REGISTRY_IMAGE:build-win32-latest
   variables:
     XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
     XDG_DATA_HOME:  "$CI_PROJECT_DIR/.local/share/"
@@ -224,21 +245,6 @@ deps-win32:
     - .cache/crossroad/
     - apt-cache
   before_script:
-    - mkdir -p $APT_CACHE
-    - apt-get update
-    - apt-get install -y --no-install-recommends -o dir::cache::archives="$APT_CACHE"
-        build-essential
-        cpio
-        gcc-mingw-w64-i686
-        g++-mingw-w64-i686
-        git
-        meson
-        pkg-config
-        python3-distutils
-        python3-docutils
-        python3-pip
-        rpm
-    - apt-get install -y --reinstall ca-certificates
     - git clone --depth=${GIT_DEPTH} git://git.tuxfamily.org/gitroot/crossroad/crossroad.git
     - cd crossroad
     - ./setup.py install --prefix=`pwd`/../.local
@@ -257,6 +263,7 @@ deps-win32:
 
 gimp-win32:
   stage: gimp
+  image: $CI_REGISTRY_IMAGE:build-win32-latest
   dependencies:
     - deps-win32
   variables:
@@ -266,22 +273,6 @@ gimp-win32:
     paths:
     - .cache/crossroad/
     - apt-cache
-  before_script:
-    - mkdir -p $APT_CACHE
-    - apt-get update
-    - apt-get install -y --no-install-recommends -o dir::cache::archives="$APT_CACHE"
-        build-essential
-        cpio
-        gcc-mingw-w64-i686
-        g++-mingw-w64-i686
-        git
-        intltool
-        libgdk-pixbuf2.0-dev
-        libglib2.0-bin
-        meson
-        python3
-        rpm
-        xsltproc
   script:
     - export PATH="`pwd`/.local/bin:$PATH"
     - mkdir _build && cd _build


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