From 94683a60119d5272e972eb792e9c49386186d90b Mon Sep 17 00:00:00 2001
From: Ben RUBSON <6764151+benrubson@users.noreply.github.com>
Date: Wed, 11 Mar 2020 19:05:15 +0100
Subject: [PATCH] Reorganize CI files (#597)

---
 .cirrus.yml |  9 ++++-----
 .travis.yml | 29 ++++++++++++++++++-----------
 ci/setup.sh | 14 --------------
 3 files changed, 22 insertions(+), 30 deletions(-)
 delete mode 100755 ci/setup.sh

diff --git a/.cirrus.yml b/.cirrus.yml
index 3b794e0..b1a7c58 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,15 +1,14 @@
 task:
+  name: FreeBSD
   freebsd_instance:
-    matrix:
-      image: freebsd-12-1-release-amd64
+    image: freebsd-12-1-release-amd64
   install_script:
     - pkg install -y bash cmake fusefs-libs gettext perl5
     - ln -s /usr/local/bin/bash /bin/bash
-    - ./ci/setup.sh
+    - kldload fuse
   script:
     - ./build.sh
-  env:
-    INTEGRATION: false
+  allow_failures: true
 
 task:
   name: MacOS
diff --git a/.travis.yml b/.travis.yml
index 46893a6..50566ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,9 @@
-language: cpp
-
 matrix:
+
   include:
-    - os: linux
+
+    - language: cpp
+      os: linux
       compiler: gcc
       dist: bionic
       sudo: required
@@ -14,10 +15,15 @@ matrix:
             - libfuse-dev
             - gettext
             - cmake
+      before_script:
+        - sudo modprobe fuse
+      script:
+        - ./build.sh
       env:
         - SUDO_TESTS=true
 
-    - os: linux
+    - language: cpp
+      os: linux
       compiler: gcc
       dist: xenial
       sudo: required
@@ -29,10 +35,15 @@ matrix:
             - libfuse-dev
             - gettext
             - cmake
+      before_script:
+        - sudo modprobe fuse
+      script:
+        - ./build.sh
       env:
         - SUDO_TESTS=true
 
-    - os: linux
+    - language: cpp
+      os: linux
       compiler: clang
       dist: xenial
       sudo: false
@@ -46,11 +57,7 @@ matrix:
             - cmake
             - clang-4.0
             - clang-tidy-4.0
+      script:
+        - ./build.sh
       env:
         - CC=clang-4.0 CXX=clang++-4.0 CHECK=true INTEGRATION=false
-
-before_script:
-  - ./ci/setup.sh
-
-script:
-  - ./build.sh
diff --git a/ci/setup.sh b/ci/setup.sh
deleted file mode 100755
index 19c9f2f..0000000
--- a/ci/setup.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash -eu
-
-: ${INTEGRATION:=true}
-
-if [[ "$INTEGRATION" == "true" ]]; then
-  if uname -s | grep -q Linux; then
-    sudo modprobe fuse
-  elif uname -s | grep -q FreeBSD; then
-    kldload fuse
-  elif uname -s | grep -q Darwin; then
-    brew cask install osxfuse
-    brew reinstall openssl
-  fi
-fi