diff options
author | iphydf <iphydf@users.noreply.github.com> | 2020-04-24 14:18:00 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2020-04-24 14:43:37 +0000 |
commit | 2c45d45133ff32d9c2c7a7ca81b1352b1aa74458 (patch) | |
tree | e0106e2167d1de857c337c690afb6691e701842b | |
parent | 7c0eb5c70bea026eca665466b05213e7b21e3cba (diff) |
Fix continuous integration builds.
-rw-r--r-- | .circleci/config.yml | 5 | ||||
-rw-r--r-- | .cirrus.yml | 21 | ||||
-rw-r--r-- | .travis/cmake-windows.sh | 2 | ||||
-rw-r--r-- | codecov.yml | 4 |
4 files changed, 18 insertions, 14 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 566f2110..034fed8b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml | |||
@@ -17,8 +17,9 @@ jobs: | |||
17 | steps: | 17 | steps: |
18 | - checkout | 18 | - checkout |
19 | - run: &apt_install | 19 | - run: &apt_install |
20 | apt update && | 20 | apt-get update && |
21 | apt install -y --no-install-recommends | 21 | DEBIAN_FRONTEND=noninteractive |
22 | apt-get install -y --no-install-recommends | ||
22 | clang | 23 | clang |
23 | cmake | 24 | cmake |
24 | libconfig-dev | 25 | libconfig-dev |
diff --git a/.cirrus.yml b/.cirrus.yml index db5a0e56..ab863125 100644 --- a/.cirrus.yml +++ b/.cirrus.yml | |||
@@ -1,16 +1,15 @@ | |||
1 | --- | 1 | --- |
2 | cirrus-ci_task: | 2 | cirrus-ci_task: |
3 | container: | 3 | container: |
4 | image: l.gcr.io/google/bazel:2.2.0 | 4 | image: toxchat/toktok-stack:0.0.7 |
5 | cpu: 8 | 5 | cpu: 2 |
6 | memory: 12G | 6 | memory: 2G |
7 | configure_script: | 7 | configure_script: |
8 | - cd .. && mv cirrus-ci-build c-toxcore | 8 | - /src/workspace/tools/inject-repo c-toxcore |
9 | - git clone --depth=1 https://github.com/TokTok/toktok-stack cirrus-ci-build | ||
10 | - mv c-toxcore cirrus-ci-build | ||
11 | - cd cirrus-ci-build | ||
12 | - tools/setup-ci | ||
13 | - bazel version | ||
14 | test_all_script: | 9 | test_all_script: |
15 | - RUN_TEST="bazel test --copt=-DUSE_IPV6=0 -c opt -k //c-toxcore/..." | 10 | - bazel test -k |
16 | - $RUN_TEST || $RUN_TEST | 11 | --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST |
12 | --config=ci | ||
13 | --config=docker | ||
14 | --config=release | ||
15 | //c-toxcore/... | ||
diff --git a/.travis/cmake-windows.sh b/.travis/cmake-windows.sh index f22accc0..85d47e1b 100644 --- a/.travis/cmake-windows.sh +++ b/.travis/cmake-windows.sh | |||
@@ -31,7 +31,7 @@ travis_script() { | |||
31 | -e ENABLE_ARCH_x86_64=$x86_64 \ | 31 | -e ENABLE_ARCH_x86_64=$x86_64 \ |
32 | -e ENABLE_TEST=true \ | 32 | -e ENABLE_TEST=true \ |
33 | -e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DMIN_LOGGER_LEVEL=DEBUG -DTEST_TIMEOUT_SECONDS=90 -DAUTOTEST=ON" \ | 33 | -e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DMIN_LOGGER_LEVEL=DEBUG -DTEST_TIMEOUT_SECONDS=90 -DAUTOTEST=ON" \ |
34 | -e DCMAKE_C_FLAGS="$C_FLAGS" \ | 34 | -e CMAKE_C_FLAGS="$C_FLAGS" \ |
35 | -e CMAKE_CXX_FLAGS="$CXX_FLAGS" \ | 35 | -e CMAKE_CXX_FLAGS="$CXX_FLAGS" \ |
36 | -e CMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ | 36 | -e CMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ |
37 | -e CMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \ | 37 | -e CMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \ |
diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 00000000..97da41be --- /dev/null +++ b/codecov.yml | |||
@@ -0,0 +1,4 @@ | |||
1 | coverage: | ||
2 | precision: 2 | ||
3 | round: down | ||
4 | range: "80...100" | ||