Reorganize CI files (#597)

This commit is contained in:
Ben RUBSON 2020-03-11 19:05:15 +01:00 committed by GitHub
parent a37e139bba
commit 94683a6011
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 30 deletions

View File

@ -1,15 +1,14 @@
task: task:
name: FreeBSD
freebsd_instance: freebsd_instance:
matrix:
image: freebsd-12-1-release-amd64 image: freebsd-12-1-release-amd64
install_script: install_script:
- pkg install -y bash cmake fusefs-libs gettext perl5 - pkg install -y bash cmake fusefs-libs gettext perl5
- ln -s /usr/local/bin/bash /bin/bash - ln -s /usr/local/bin/bash /bin/bash
- ./ci/setup.sh - kldload fuse
script: script:
- ./build.sh - ./build.sh
env: allow_failures: true
INTEGRATION: false
task: task:
name: MacOS name: MacOS

View File

@ -1,8 +1,9 @@
language: cpp
matrix: matrix:
include: include:
- os: linux
- language: cpp
os: linux
compiler: gcc compiler: gcc
dist: bionic dist: bionic
sudo: required sudo: required
@ -14,10 +15,15 @@ matrix:
- libfuse-dev - libfuse-dev
- gettext - gettext
- cmake - cmake
before_script:
- sudo modprobe fuse
script:
- ./build.sh
env: env:
- SUDO_TESTS=true - SUDO_TESTS=true
- os: linux - language: cpp
os: linux
compiler: gcc compiler: gcc
dist: xenial dist: xenial
sudo: required sudo: required
@ -29,10 +35,15 @@ matrix:
- libfuse-dev - libfuse-dev
- gettext - gettext
- cmake - cmake
before_script:
- sudo modprobe fuse
script:
- ./build.sh
env: env:
- SUDO_TESTS=true - SUDO_TESTS=true
- os: linux - language: cpp
os: linux
compiler: clang compiler: clang
dist: xenial dist: xenial
sudo: false sudo: false
@ -46,11 +57,7 @@ matrix:
- cmake - cmake
- clang-4.0 - clang-4.0
- clang-tidy-4.0 - clang-tidy-4.0
env:
- CC=clang-4.0 CXX=clang++-4.0 CHECK=true INTEGRATION=false
before_script:
- ./ci/setup.sh
script: script:
- ./build.sh - ./build.sh
env:
- CC=clang-4.0 CXX=clang++-4.0 CHECK=true INTEGRATION=false

View File

@ -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