Skip to content

Commit

Permalink
Fix continuous integration builds.
Browse files Browse the repository at this point in the history
  • Loading branch information
iphydf committed Apr 24, 2020
1 parent 7c0eb5c commit 2c45d45
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 14 deletions.
5 changes: 3 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ jobs:
steps:
- checkout
- run: &apt_install
apt update &&
apt install -y --no-install-recommends
apt-get update &&
DEBIAN_FRONTEND=noninteractive
apt-get install -y --no-install-recommends
clang
cmake
libconfig-dev
Expand Down
21 changes: 10 additions & 11 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
---
cirrus-ci_task:
container:
image: l.gcr.io/google/bazel:2.2.0
cpu: 8
memory: 12G
image: toxchat/toktok-stack:0.0.7
cpu: 2
memory: 2G
configure_script:
- cd .. && mv cirrus-ci-build c-toxcore
- git clone --depth=1 https://github.com/TokTok/toktok-stack cirrus-ci-build
- mv c-toxcore cirrus-ci-build
- cd cirrus-ci-build
- tools/setup-ci
- bazel version
- /src/workspace/tools/inject-repo c-toxcore
test_all_script:
- RUN_TEST="bazel test --copt=-DUSE_IPV6=0 -c opt -k //c-toxcore/..."
- $RUN_TEST || $RUN_TEST
- bazel test -k
--remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
--config=ci
--config=docker
--config=release
//c-toxcore/...
2 changes: 1 addition & 1 deletion .travis/cmake-windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ travis_script() {
-e ENABLE_ARCH_x86_64=$x86_64 \
-e ENABLE_TEST=true \
-e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DMIN_LOGGER_LEVEL=DEBUG -DTEST_TIMEOUT_SECONDS=90 -DAUTOTEST=ON" \
-e DCMAKE_C_FLAGS="$C_FLAGS" \
-e CMAKE_C_FLAGS="$C_FLAGS" \
-e CMAKE_CXX_FLAGS="$CXX_FLAGS" \
-e CMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \
-e CMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \
Expand Down
4 changes: 4 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
coverage:
precision: 2
round: down
range: "80...100"

0 comments on commit 2c45d45

Please sign in to comment.