Skip to content

Commit 94683a6

Browse files
authored
Reorganize CI files (#597)
1 parent a37e139 commit 94683a6

File tree

3 files changed

+22
-30
lines changed

3 files changed

+22
-30
lines changed

.cirrus.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
task:
2+
name: FreeBSD
23
freebsd_instance:
3-
matrix:
4-
image: freebsd-12-1-release-amd64
4+
image: freebsd-12-1-release-amd64
55
install_script:
66
- pkg install -y bash cmake fusefs-libs gettext perl5
77
- ln -s /usr/local/bin/bash /bin/bash
8-
- ./ci/setup.sh
8+
- kldload fuse
99
script:
1010
- ./build.sh
11-
env:
12-
INTEGRATION: false
11+
allow_failures: true
1312

1413
task:
1514
name: MacOS

.travis.yml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
language: cpp
2-
31
matrix:
2+
43
include:
5-
- os: linux
4+
5+
- language: cpp
6+
os: linux
67
compiler: gcc
78
dist: bionic
89
sudo: required
@@ -14,10 +15,15 @@ matrix:
1415
- libfuse-dev
1516
- gettext
1617
- cmake
18+
before_script:
19+
- sudo modprobe fuse
20+
script:
21+
- ./build.sh
1722
env:
1823
- SUDO_TESTS=true
1924

20-
- os: linux
25+
- language: cpp
26+
os: linux
2127
compiler: gcc
2228
dist: xenial
2329
sudo: required
@@ -29,10 +35,15 @@ matrix:
2935
- libfuse-dev
3036
- gettext
3137
- cmake
38+
before_script:
39+
- sudo modprobe fuse
40+
script:
41+
- ./build.sh
3242
env:
3343
- SUDO_TESTS=true
3444

35-
- os: linux
45+
- language: cpp
46+
os: linux
3647
compiler: clang
3748
dist: xenial
3849
sudo: false
@@ -46,11 +57,7 @@ matrix:
4657
- cmake
4758
- clang-4.0
4859
- clang-tidy-4.0
60+
script:
61+
- ./build.sh
4962
env:
5063
- CC=clang-4.0 CXX=clang++-4.0 CHECK=true INTEGRATION=false
51-
52-
before_script:
53-
- ./ci/setup.sh
54-
55-
script:
56-
- ./build.sh

ci/setup.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)