From 1fd6f2bf7cd243ad3e2c126ebce723d57000c7b4 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Thu, 9 Jul 2020 22:56:31 +0200
Subject: Restructure CI

---
 .travis.yml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 4e14339..5f60e59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,17 +5,15 @@ dist: bionic
 
 before_script:
  - export -f travis_fold
+ - export OS="$TRAVIS_OS_NAME"
 
 script:
- - "bash .travis-ci.sh"
+ - "bash .ci.sh"
 
 addons:
   apt:
-    packages: &base_build
-     - ccache
     packages: &core_build
      # This is all the bits we need to enable all options
-     - *base_build
      - libasound2-dev
      - libevdev-dev
      - libola-dev
@@ -125,11 +123,6 @@ env:
 
 cache:
   apt: true
-  directories:
-    - $HOME/.ccache # ccache cache
-
-before_cache:
-  - ccache -s # see how many hits ccache got
 
 before_install:
 # Travis clones with --branch, which omits tags. Since we use them for the version string at build time, fetch them
@@ -138,21 +131,19 @@ before_install:
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
 # 'brew install' sometimes returns non-zero for some arcane reason. Executing 'true' resets the exit code and allows Travis to continue building...
 # Travis seems to have Python 2.7 installed by default, which for some reason prevents pkg-config from reading python3.pc
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ola lua openssl jack python3; brew link --overwrite python; true; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ola lua openssl jack python3; brew link --overwrite python; true; fi
 # OpenSSL is not a proper install due to some Apple bull, so provide additional locations via the environment...
 # Additionally, newer versions of this "recipe" seem to use the name 'openssl@1.1' instead of plain 'openssl' and there seems to be
 # no way to programmatically get the link and include paths. Genius! Hardcoding the new version for the time being...
  - export CFLAGS="$CFLAGS -I/usr/local/opt/openssl@1.1/include"
  - export LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl@1.1/lib" 
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/ccache/libexec:$PATH; fi # Use ccache on Mac too
- - if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "sanitize" \) -a "$CC" = "gcc" ]; then export CC="ccache gcc-8"; export CXX="ccache g++-8"; fi
 #Use the latest clang if we're compiling with clang
  - if [ "$TRAVIS_OS_NAME" == "linux" -a "$CC" = "clang" ]; then export CC="clang-6.0"; export CXX="clang-6.0"; fi
 #Report the compiler versions
  - $CC --version
 #OS X uses something other than $CXX variable
  - if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "sanitize" \) ]; then $CXX --version; fi
-# Download libraries to link with on Windows
+# Download libraries to link with for Windows
  - if [ "$TASK" == "windows" ]; then wget "https://downloads.sourceforge.net/project/luabinaries/5.3.5/Windows%20Libraries/Dynamic/lua-5.3.5_Win64_dllw6_lib.zip" -O lua53.zip; unzip lua53.zip lua53.dll; fi
 
 notifications:
-- 
cgit v1.2.3