AWARE SYSTEMS
TIFF and LibTiff Mail List Archive

Thread

2017.06.07 22:30 "[Tiff] [PATCH] Windows CI support for GitHub and AppVeyor", by Roger Leigh
2017.06.08 09:47 "Re: [Tiff] [PATCH] Windows CI support for GitHub and AppVeyor", by
2017.06.09 10:54 "Re: [Tiff] [PATCH] Unix/Linux CI support for GitHub and Travis", by
2017.06.08 11:22 "Re: [Tiff] [PATCH] Unix/Linux CI support for GitHub and Travis", by
2017.06.08 20:46 "Re: [Tiff] [PATCH] Unix/Linux CI support for GitHub and Travis", by Even Rouault
2017.06.09 11:12 "Re: [Tiff] [PATCH] Unix/Linux CI support for GitHub and Travis", by Even Rouault
2017.06.09 13:18 "Re: [Tiff] [PATCH] Unix/Linux CI support for GitHub and Travis", by Bob Friesenhahn
2017.06.09 21:10 "Re: [Tiff] [PATCH] Unix/Linux CI support for GitHub and Travis", by Roger Leigh
2017.06.09 21:23 "Re: [Tiff] [PATCH] Unix/Linux CI support for GitHub and Travis", by Even Rouault
2017.06.09 22:00 "Re: [Tiff] [PATCH] Unix/Linux CI support for GitHub and Travis", by Roger Leigh
2017.06.09 22:05 "Re: [Tiff] [PATCH] Unix/Linux CI support for GitHub and Travis", by Aaron Boxer
2017.06.09 23:15 "Re: [Tiff] [PATCH] Unix/Linux CI support for GitHub and Travis", by Even Rouault
2017.06.10 01:56 "Re: [Tiff] [PATCH] Unix/Linux CI support for GitHub and Travis", by Kemp Watson
2017.06.10 08:58 "Re: [Tiff] [PATCH] Unix/Linux CI support for GitHub and Travis", by Roger Leigh
2017.06.10 09:33 "Re: [Tiff] [PATCH] Unix/Linux CI support for GitHub and Travis", by Even Rouault

2017.06.09 10:54 "Re: [Tiff] [PATCH] Unix/Linux CI support for GitHub and Travis", by

On 2017-06-08 21:46, Even Rouault wrote:

>> Together with the Windows patches, this provides pretty decent test >> coverage for common platforms and compilers, and should pick up most

>> regressions in the codebase.
>
> All 3 patches committed. Thanks!

Thank you. One problem I noticed is that the build/travis-ci script does not have executable permissions, which is needed to build. I think with CVS that requires a chmod +x of the ,v file in the repository if was not set when initially added.

I've also attached a new patch with a few small improvements and the addition of MacOS X to the test matrix. You can see the results here:

https://github.com/rleigh-codelibre/libtiff/commits/ci-fixes https://travis-ci.org/rleigh-codelibre/libtiff/builds/241129101

https://ci.appveyor.com/project/rleigh-codelibre/libtiff/build/1.0.53

Regards,
Roger

From 83528f1c8a3b24c4a7c513e1c76e0ed89d27d52d Mon Sep 17 00:00:00 2001

From: Roger Leigh <rleigh@dundee.ac.uk>

Date: Fri, 9 Jun 2017 10:55:12 +0100 Subject: [PATCH 1/2] ci: Travis script improvements

---

 .appveyor.yml   |  8 +++++++-
 .travis.yml     | 11 +++++++----
 build/travis-ci | 38 ++++++++++++++++++++++++++++----------

 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml

index fb534236..e5af6c98 100644
--- a/.appveyor.yml

+++ b/.appveyor.yml

@@ -7,24 +7,31 @@ environment:

  matrix:

      generator: Unix Makefiles

      shared: ON

+ configuration: Debug

      generator: Unix Makefiles

      shared: OFF

      generator: Unix Makefiles

      shared: ON

+ configuration: Debug

      generator: Unix Makefiles

      shared: OFF

      generator: Visual Studio 14 2015 Win64

      shared: ON

+ configuration: Debug

      generator: Visual Studio 14 2015 Win64

      shared: OFF

 cache:

  - 'c:\projects\download -> appveyor.yml'

@@ -37,7 +44,6 @@ clone_folder: 'c:\projects\libtiff'
 clone_depth: 5

 platform: x64

 init:

  - git config --global core.autocrlf input

diff --git a/.travis.yml b/.travis.yml
index 9b371162..e438945c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,18 +14,21 @@ addons:

    - compiler:

+os:
+  - linux
+  - osx

 env:
   matrix:
     - BUILD=autoconf

+ - 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:
   - ./build/travis-ci "$BUILD" "$TOOL" "$TYPE"
diff --git a/build/travis-ci b/build/travis-ci
index c34791a1..18ef90a5 100644
--- a/build/travis-ci
+++ b/build/travis-ci
@@ -8,9 +8,12 @@ set -x
 # Test autoconf build
 autoconf_build()
 {
+ autoreconf -ivf
+
     mkdir autoconf-build
     cd autoconf-build

-    ../configure --prefix=$(readlink -f ../autoconf-install)
+    echo "Running ../configure --prefix=$(pwd)/../autoconf-install) ${opts}"
+    ../configure --prefix=$(pwd)/../autoconf-install ${opts}

     make
     make install
     make check
@@ -22,19 +25,29 @@ cmake_deps()
     mkdir -p download
     mkdir -p tools

-    cmake_file="cmake-3.8.2-Linux-x86_64.tar.gz"
+    if [ "$(uname -s)" = "Linux" ]; then
+        cmake_file="cmake-3.8.2-Linux-x86_64.tar.gz"
+        cmake_hash="574670