2017.11.23 09:10 "[Tiff] [PATCH] CI improvements for GitLab and GitHub", by Roger Leigh

These patches

• Add support for gitlab-ci (same as the existing travis-ci but without the MacOS X support)
• Drop unused logic from the travis CI configuration
• Fix the appveyor cygwin build (the OS image changed to include cygwin git, which broke the git clone when it was on the path), and also stop saving the build zips since there's a quota limit we will exceed

Test results for each:

https://gitlab.com/rleigh/libtiff/pipelines/14278264 https://travis-ci.org/rleigh-codelibre/libtiff/builds/306061381

https://ci.appveyor.com/project/rleigh-codelibre/libtiff-9jala/build/1.0.4

Regards,
Roger

From 1ac42d5f93f9dfacff6e3294196d409c068e4c69 Mon Sep 17 00:00:00 2001 From: Roger Leigh <rleigh@codelibre.net> Date: Wed, 22 Nov 2017 22:22:47 +0000 Subject: [PATCH 1/3] Add gitlab-ci build support

---

 .gitlab-ci.yml  | 21 +++++++++++++++++++++
 build/gitlab-ci | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 2 files changed, 77 insertions(+)
 create mode 100644 .gitlab-ci.yml
 create mode 100644 build/gitlab-ci

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..fbb7724e
--- /dev/null

+++ b/.gitlab-ci.yml
@@ -0,0 +1,21 @@
+image: ubuntu:16.04
+before_script:
+  - apt-get update -qq && apt-get install -y -qq autoconf automake build-essential cmake libtool libjpeg8-dev libjbig-dev liblzma-dev ninja-build zlib1g-dev
+
+stages:
+  - build
+
+autoconf:
+  stage: build
+  script:
+    - sh build/gitlab-ci autoconf
+
+cmake-makefiles:
+  stage: build
+  script:
+    - sh build/gitlab-ci cmake "Unix Makefiles" Release
+
+cmake-ninja:
+  stage: build
+  script:
+    - sh build/gitlab-ci cmake "Ninja" Debug
diff --git a/build/gitlab-ci b/build/gitlab-ci
new file mode 100644
index 00000000..25b3b92f
--- /dev/null
+++ b/build/gitlab-ci
@@ -0,0 +1,56 @@
+#!/bin/sh
+# This script is used for testing the build, primarily for use
+# with travis, but may be used by hand as well.
+
+set -e
+set -x
+
+# Test autoconf build
+autoconf_build()
+{
+    autoreconf -ivf
+
+    mkdir autoconf-build
+    cd autoconf-build
+    echo "Running ../configure --prefix=$(pwd)/../autoconf-install) ${opts}"
+    ../configure --prefix=$(pwd)/../autoconf-install ${opts}
+    make
+    make install
+    make check
+}
+
+# Test autoconf build
+cmake_build()
+{
+    PATH="$(pwd)/tools/bin:$PATH"
+    if [ "$(uname -s)" = "Darwin" ]; then
+        PATH="$(pwd)/tools/CMake.app/Contents/bin:$PATH"
+    fi
+    mkdir cmake-build
+    cd cmake-build
+    echo "Running cmake -G "$1" -DCMAKE_BUILD_TYPE="$2" -DCMAKE_INSTALL_PREFIX=../autoconf-install ${opts} .."
+    cmake -G "$1" -DCMAKE_BUILD_TYPE="$2" -DCMAKE_INSTALL_PREFIX=../autoconf-install ${opts} ..
+    cmake --build .
+    cmake --build . --target install
+    ctest -V
+}
+
+build=$1
+shift
+
+case $build in
+    autoconf)
+        echo "Testing Autoconf build"
+        autoconf_build "$@"
+        ;;
+    cmake)
+        echo "Testing CMake build"
+        cmake_build "$@"
+        ;;
+    *)
+        echo "Invalid argument: \"$arg\"" >&2
+        exit 1
+        ;;
+esac
+

+exit 0
--
2.15.0

Subject: [PATCH 2/3] travis-ci: Remove unused matrix exclusion

---
 .travis.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b18ea5c5..96d262e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,11 +24,5 @@ env:

• BUILD=cmake TOOL="Unix Makefiles" TYPE=Release
• BUILD=cmake TOOL="Ninja" TYPE=Debug

-matrix:

• fast_finish: true
• exclude:
• - os: linux

- env: BUILD=cmake TOOL="Ninja" TYPE=Debug NETACCESSOR=cfurl TRANSCODER=macosunicodeconverter
-
 script:
   - sh ./build/travis-ci "$BUILD" "$TOOL" "$TYPE"
--
2.15.0

From 68c928923a86c115cc7dedf8099b8b214196a357 Mon Sep 17 00:00:00 2001 From: Roger Leigh <rleigh@codelibre.net> Date: Thu, 23 Nov 2017 08:23:34 +0000 Subject: [PATCH 3/3] appveyor: Correct path for git clone and skip artefact

 archival

---
 .appveyor.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index e5af6c98..f469afe4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -47,6 +47,8 @@ platform: x64

 init:
   - git config --global core.autocrlf input
+
+before_build:

• 'FOR /F "tokens=* USEBACKQ" %%F IN (`C:\cygwin64\bin\cygpath -u %AV_TIFF_SOURCE%`) DO SET AV_TIFF_CYG_SOURCE=%%F'
• 'FOR /F "tokens=* USEBACKQ" %%F IN (`C:\cygwin64\bin\cygpath -u %AV_TIFF_INSTALL%`) DO SET AV_TIFF_CYG_INSTALL=%%F'
• 'if %compiler%==cygwin-cmake C:\Cygwin64\setup-x86_64 -q -R C:\Cygwin64 -s http://cygwin.mirror.constant.com -l %AV_TIFF_DOWNLOAD%\cygwin -P cmake,libjpeg-devel,zlib-devel' @@ -60,8 +62,6 @@ init:
• 'if %compiler%==cygwin-cmake set "AV_TIFF_CMAKE_SOURCE=%AV_TIFF_CYG_SOURCE%'
• 'if %compiler%==cygwin-cmake set "AV_TIFF_CMAKE_INSTALL=%AV_TIFF_CYG_INSTALL%'
• 'if %compiler%==vc14-nmake call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %platform%'

-
-before_build:

• mkdir %AV_TIFF_BUILD%
• cd %AV_TIFF_BUILD%
• if NOT %compiler%==vc14-nmake echo Running cmake -G "%generator%" -DCMAKE_INSTALL_PREFIX=%AV_TIFF_CMAKE_INSTALL% -DCMAKE_BUILD_TYPE=%configuration% %AV_TIFF_CMAKE_SOURCE% @@ -102,8 +102,10 @@ before_test:

   - 'if %compiler%==vc14-cmake ctest -V -C %configuration%'
 # vc14-nmake does not support unit tests

-artifacts:

• - path: libtiff.zip
• name: libtiff.zip
• - path: libtiff-build.zip
• name: libtiff-build.zip +# AppVeyor don't yet have a configurable retention policy, so this will +# eventually use up all the storage allowance. +#artifacts:

+#  - path: libtiff.zip
+#    name: libtiff.zip
+#  - path: libtiff-build.zip
+#    name: libtiff-build.zip

--
2.15.0