[gimp/wip/Jehan/shorter-distcheck: 1/2] gitlab-ci: make distcheck depend on the build.




commit a401d27026d3da98f58db798948c30d5115820fb
Author: Jehan <jehan girinstud io>
Date:   Thu Aug 6 12:51:46 2020 +0200

    gitlab-ci: make distcheck depend on the build.
    
    Instead of redoing a build (because `make distcheck` doesn't work
    without a `make` first, at least as far as my tests went), let's reuse
    the existing normal autotools build. This should shave off more time
    from the distcheck step hopefully.

 .gitlab-ci.yml | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 82 insertions(+), 11 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc7509dead..251053b549 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ image: debian:testing
 stages:
   - dependencies
   - gimp
+  - distribution
 
 variables:
   GIT_DEPTH: "1"
@@ -109,7 +110,21 @@ deps-debian/testing:
     name: "app-build-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     paths:
     - _build
-    #- "${INSTALL_DIR}"
+    - "${INSTALL_DIR}"
+    - compile
+    - config.guess
+    - config.h.in
+    - config.sub
+    - configure
+    - depcomp
+    - gtk-doc.make
+    - install-sh
+    - INSTALL
+    - ltmain.sh
+    - missing
+    - po
+    - py-compile
+    - test-driver
   before_script:
     - apt-get update
     - apt-get install -y --no-install-recommends
@@ -178,17 +193,73 @@ gimp-debian/testing-autotools:
     - make -j "$(nproc)"
     - make check
 
-gimp-debian/testing-autotools-distcheck:
-  extends: .gimp-debian/testing-base
+distcheck:
+  dependencies:
+    - gimp-debian/testing-autotools
+  stage: distribution
+  artifacts:
+    expire_in: 1 week
+    when: always
+    name: "app-dist-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
+    paths:
+    - _build
+  before_script:
+    - apt-get update
+    - apt-get install -y --no-install-recommends
+        at-spi2-core
+        build-essential
+        desktop-file-utils
+        ffmpeg
+        hicolor-icon-theme
+        ghostscript
+        git
+        glib-networking
+        gobject-introspection
+        gtk-doc-tools
+        intltool
+        iso-codes
+        libappstream-glib-dev
+        libbz2-dev
+        libdbus-glib-1-dev
+        libexif-dev
+        libgexiv2-dev
+        libgirepository1.0-dev
+        libgtk2.0-bin
+        libgtk2.0-dev
+        libgudev-1.0-dev
+        libjson-glib-dev
+        liblcms2-dev
+        liblzma-dev
+        libmng-dev
+        libmypaint-dev
+        libopenexr-dev
+        libpoppler-glib-dev
+        libraw19
+        librsvg2-dev
+        libspiro-dev
+        libtiff-dev
+        libtool
+        libumfpack5
+        libwebp-dev
+        libwmf-dev
+        libxmu-dev
+        libxpm-dev
+        meson
+        mypaint-brushes
+        poppler-data
+        python2
+        python-dev
+        xauth
+        xvfb
+    - export PKG_CONFIG_PATH="${INSTALL_PREFIX}/lib/pkgconfig:${INSTALL_PREFIX}/share/pkgconfig"
+    - export PKG_CONFIG_PATH="${INSTALL_PREFIX}/lib/`gcc -print-multiarch`/pkgconfig/:$PKG_CONFIG_PATH"
+    - export PKG_CONFIG_PATH="${INSTALL_PREFIX}/share/`gcc -print-multiarch`/pkgconfig/:$PKG_CONFIG_PATH"
+    - export LD_LIBRARY_PATH="${INSTALL_PREFIX}/lib:${LD_LIBRARY_PATH}"
+    - export LD_LIBRARY_PATH="${INSTALL_PREFIX}/lib/`gcc -print-multiarch`:$LD_LIBRARY_PATH"
+    - export XDG_DATA_DIRS="${INSTALL_PREFIX}/share:/usr/local/share:/usr/share"
+    - export PATH="${INSTALL_PREFIX}/bin:$PATH"
   script:
-    # Actual build.
-    - mkdir _build
     - cd _build
-    - ../autogen.sh
-        --prefix="${INSTALL_PREFIX}"
-        --enable-debug
-        --disable-python
-        --enable-gtk-doc
-    - make -j "$(nproc)"
     - make distcheck
   allow_failure: true
+  needs: ["gimp-debian/testing-autotools"]


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