Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganize CI files #597

Merged
merged 4 commits into from
Mar 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
29 changes: 18 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
language: cpp

matrix:

include:
- os: linux

- language: cpp
os: linux
compiler: gcc
dist: bionic
sudo: required
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
14 changes: 0 additions & 14 deletions ci/setup.sh

This file was deleted.