From ef7058422eec1c8b90208bb3522fce28374feb58 Mon Sep 17 00:00:00 2001
From: iphydf <iphydf@users.noreply.github.com>
Date: Sun, 22 Mar 2020 11:18:54 +0000
Subject: [PATCH] Smarter setup of bazel remote cache on Cirrus CI.

We now check whether the cache application is reachable and running via
cURL. If it's running, we add the `--config=remote` line.
---
 .cirrus.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 20126a213e..db5a0e5613 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,14 +5,11 @@ cirrus-ci_task:
     cpu: 8
     memory: 12G
   configure_script:
-    - echo "build --jobs=50 --curses=no --verbose_failures" | tee ~/.bazelrc
-    - echo "build --config=linux" | tee -a ~/.bazelrc
-    - echo "build --config=clang" | tee -a ~/.bazelrc
-#    - echo "build --config=remote" | tee -a ~/.bazelrc
     - cd .. && mv cirrus-ci-build c-toxcore
-    - git clone --branch=upgrade-bazel --depth=1 https://github.com/iphydf/toktok-stack cirrus-ci-build
+    - git clone --depth=1 https://github.com/TokTok/toktok-stack cirrus-ci-build
     - mv c-toxcore cirrus-ci-build
-    - cd -
+    - cd cirrus-ci-build
+    - tools/setup-ci
     - bazel version
   test_all_script:
     - RUN_TEST="bazel test --copt=-DUSE_IPV6=0 -c opt -k //c-toxcore/..."