From 1ce667ff7be902e376647ea81d812b75f3e43a00 Mon Sep 17 00:00:00 2001
From: Chris Dickens <christopher.a.dickens@gmail.com>
Date: Tue, 31 Mar 2020 15:47:31 -0700
Subject: Move CI-related files into .private directory and add unified build
 script

The files needed for Continuous Integration (AppVeyor, Travis) are not
meant for public consumption, so clean up the root directory by moving
these files underneath .private.

Create a single build script that is leveraged by both AppVeyor and
Travis. This script replaces the previous 'travis-autogen.sh' file and
enables additional compiler warnings that should provide additional
coverage for all build environments.

Update the Travis configuration file to absorb the Brewfile and update
the Xcode images. Per warnings from Travis, Xcode6.4 is obsolete, thus
replace it with Xcode7.3. Additionally remove the "gcc" variants for the
macOS builds. The builds never used gcc to begin with and actually using
gcc causes build errors due to Clang-specific pragmas in the IOKit
header files.

Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
---
 .travis.yml | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 0111925..47ce5aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,53 +1,53 @@
 language: c
 
+git:
+    depth: 1
+
 matrix:
     include:
-        - os: linux
-          dist: bionic
-          compiler: gcc
         - os: linux
           dist: bionic
           compiler: clang
         - os: linux
-          dist: xenial
+          dist: bionic
           compiler: gcc
         - os: linux
           dist: xenial
           compiler: clang
-        - os: osx
-          osx_image: xcode11.3
+        - os: linux
+          dist: xenial
           compiler: gcc
         - os: osx
           osx_image: xcode11.3
           compiler: clang
-        - os: osx
-          osx_image: xcode9.4
-          compiler: gcc
         - os: osx
           osx_image: xcode9.4
           compiler: clang
         - os: osx
-          osx_image: xcode6.4
-          compiler: gcc
-        - os: osx
-          osx_image: xcode6.4
+          osx_image: xcode7.3
           compiler: clang
 
 addons:
-    homebrew:
-        update: true
-        brewfile: true
     apt:
         packages:
             - autoconf
             - automake
             - libtool
-            - m4
             - libudev-dev
-        sources:
-            - ubuntu-toolchain-r-test
+            - m4
+    homebrew:
+        packages:
+            - autoconf
+            - automake
+            - libtool
+            - m4
+        update: true
+
+before_script:
+    - ./bootstrap.sh
 
 script:
-    - ./travis-autogen.sh && make -j4
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make clean && ./travis-autogen.sh --disable-udev && make -j4 ; fi
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cd Xcode && xcodebuild -project libusb.xcodeproj ; fi
+    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then .private/ci-build.sh --build-dir build-netlink -- --disable-udev; fi
+    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then .private/ci-build.sh --build-dir build-udev -- --enable-udev; fi
+    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then .private/ci-build.sh --build-dir build; fi
+    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cd Xcode && xcodebuild -project libusb.xcodeproj; fi
-- 
cgit v1.2.1