[gimp/wip/Jehan/more-CI-updates: 1/2] gitlab-ci: porting the Windows cross-build CI to a Debian image.



commit 6b7d1d13d8b80b160c805fec40c8659e42c2ad31
Author: Jehan <jehan girinstud io>
Date:   Fri Apr 17 16:13:16 2020 +0200

    gitlab-ci: porting the Windows cross-build CI to a Debian image.
    
    As all other builds, let's use Debian/testing.

 .gitlab-ci.yml | 128 +++++++++++++++++++++------------------------------------
 1 file changed, 46 insertions(+), 82 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb6b7a9d85..78c0286c76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,7 +173,6 @@ gimp-debian/testing-clang:
 ## WINDOWS 64-bit CI ##
 
 deps-win64:
-  image: fedora:31
   stage: dependencies
   variables:
     XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
@@ -181,35 +180,24 @@ deps-win64:
   cache:
     paths:
     - .cache/crossroad/
-    - dnf_cache
   before_script:
-    - dnf install --assumeyes --setopt=cachedir=`pwd`/dnf_cache --verbose
-        automake
-        autoconf
-        meson
-        cmake
-        gettext
+    - apt-get update
+    - apt-get install -y --no-install-recommends
+        build-essential
+        cpio
+        gcc-mingw-w64-x86-64
+        g++-mingw-w64-x86-64
         git
-        gcc
-        gcc-c++
-        intltool
-        libtool
-        libxslt
-        make
-        mingw64-gcc
-        mingw64-gcc-c++
-        mingw64-binutils
-        cpio rpm
+        meson
+        pkg-config
+        python3-distutils
         python3-docutils
-        python3-setuptools
-        shared-mime-info
-        which
-        gdk-pixbuf2
+        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
     - cd ..
-    - gdk-pixbuf-query-loaders-64 > /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders.cache
   script:
     - export PATH="`pwd`/.local/bin:$PATH"
     - crossroad w64 gimp --run="build/windows/crossbuild-gitlab-ci/build-deps.sh"
@@ -222,7 +210,6 @@ deps-win64:
       - _deps/
 
 gimp-win64:
-  image: fedora:31
   stage: gimp
   dependencies:
     - deps-win64
@@ -232,26 +219,21 @@ gimp-win64:
   cache:
     paths:
     - .cache/crossroad/
-    - dnf_cache
   before_script:
-    - dnf install --assumeyes --setopt=cachedir=`pwd`/dnf_cache --verbose
-        meson
-        gettext
-        gcc
-        gcc-c++
+    - apt-get update
+    - apt-get install -y --no-install-recommends
+        build-essential
+        cpio
+        gcc-mingw-w64-x86-64
+        g++-mingw-w64-x86-64
         git
         intltool
-        libtool
-        libxslt
-        make
-        mingw64-gcc
-        mingw64-gcc-c++
-        mingw64-binutils
-        cpio rpm
-        shared-mime-info
-        which
-        gdk-pixbuf2-devel
-        glib2-devel
+        libgdk-pixbuf2.0-dev
+        libglib2.0-bin
+        meson
+        python3
+        rpm
+        xsltproc
   script:
     - export PATH="`pwd`/.local/bin:$PATH"
     - mkdir _build && cd _build
@@ -275,7 +257,6 @@ gimp-win64:
 ## WINDOWS 32-bit CI ##
 
 deps-win32:
-  image: fedora:31
   stage: dependencies
   variables:
     XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
@@ -283,35 +264,24 @@ deps-win32:
   cache:
     paths:
     - .cache/crossroad/
-    - dnf_cache
   before_script:
-    - dnf install --assumeyes --setopt=cachedir=`pwd`/dnf_cache --verbose
-        automake
-        autoconf
-        meson
-        cmake
-        gettext
+    - apt-get update
+    - apt-get install -y --no-install-recommends
+        build-essential
+        cpio
+        gcc-mingw-w64-i686
+        g++-mingw-w64-i686
         git
-        gcc
-        gcc-c++
-        intltool
-        libtool
-        libxslt
-        make
-        mingw32-gcc
-        mingw32-gcc-c++
-        mingw32-binutils
-        cpio rpm
+        meson
+        pkg-config
+        python3-distutils
         python3-docutils
-        python3-setuptools
-        shared-mime-info
-        which
-        gdk-pixbuf2
+        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
     - cd ..
-    - gdk-pixbuf-query-loaders-64 > /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders.cache
   script:
     - export PATH="`pwd`/.local/bin:$PATH"
     - crossroad w32 gimp --run="build/windows/crossbuild-gitlab-ci/build-deps.sh"
@@ -324,7 +294,6 @@ deps-win32:
       - _deps/
 
 gimp-win32:
-  image: fedora:31
   stage: gimp
   dependencies:
     - deps-win32
@@ -334,26 +303,21 @@ gimp-win32:
   cache:
     paths:
     - .cache/crossroad/
-    - dnf_cache
   before_script:
-    - dnf install --assumeyes --setopt=cachedir=`pwd`/dnf_cache --verbose
-        meson
-        gettext
-        gcc
-        gcc-c++
+    - apt-get update
+    - apt-get install -y --no-install-recommends
+        build-essential
+        cpio
+        gcc-mingw-w64-i686
+        g++-mingw-w64-i686
         git
         intltool
-        libtool
-        libxslt
-        make
-        mingw32-gcc
-        mingw32-gcc-c++
-        mingw32-binutils
-        cpio rpm
-        shared-mime-info
-        which
-        gdk-pixbuf2-devel
-        glib2-devel
+        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]