chore: Use new bazel script for circle ci.

TokTok · Feb 20, 2025 · 199878f · 199878f
1 parent 8278e9c
commit 199878f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 29 deletions.
diff --git a/.circleci/bazel-test b/.circleci/bazel-test
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,9 +6,9 @@ workflows:
   circleci:
     jobs:
       - bazel-asan
-      - bazel-dbg
+      - bazel-debug
       - bazel-msan
-      - bazel-opt
+      - bazel-release
       - clang-analyze
       - cpplint
       - static-analysis
@@ -20,41 +20,45 @@ jobs:
   bazel-asan:
     working_directory: /tmp/cirrus-ci-build
     docker:
-      - image: toxchat/toktok-stack:latest-asan
+      - image: toxchat/toktok-stack:latest
 
     steps:
       - checkout
-      - run: .circleci/bazel-test
+      - run: bash <(curl -s https://raw.githubusercontent.com/TokTok/ci-tools/refs/heads/master/tools/circleci-bazel-test)
+          --build_tag_filters=-haskell,-fuzz-test
+          --test_tag_filters=-haskell,-fuzz-test
           //c-toxcore/...
 
-  bazel-dbg:
+  bazel-debug:
     working_directory: /tmp/cirrus-ci-build
     docker:
-      - image: toxchat/toktok-stack:latest-debug
+      - image: toxchat/toktok-stack:latest
 
     steps:
       - checkout
-      - run: .circleci/bazel-test
+      - run: bash <(curl -s https://raw.githubusercontent.com/TokTok/ci-tools/refs/heads/master/tools/circleci-bazel-test)
+          --build_tag_filters=-haskell
+          --test_tag_filters=-haskell
           //c-toxcore/...
 
   bazel-msan:
     working_directory: /tmp/cirrus-ci-build
     docker:
-      - image: toxchat/toktok-stack:latest-msan
+      - image: toxchat/toktok-stack:latest
 
     steps:
       - checkout
-      - run: .circleci/bazel-test
+      - run: bash <(curl -s https://raw.githubusercontent.com/TokTok/ci-tools/refs/heads/master/tools/circleci-bazel-test)
           //c-toxcore/auto_tests:lossless_packet_test
 
-  bazel-opt:
+  bazel-release:
     working_directory: /tmp/cirrus-ci-build
     docker:
-      - image: toxchat/toktok-stack:latest-release
+      - image: toxchat/toktok-stack:latest
 
     steps:
       - checkout
-      - run: .circleci/bazel-test
+      - run: bash <(curl -s https://raw.githubusercontent.com/TokTok/ci-tools/refs/heads/master/tools/circleci-bazel-test)
           //c-toxcore/...
 
   static-analysis:

diff --git a/auto_tests/proxy_test.c b/auto_tests/proxy_test.c
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
         c_sleep(100);
     }
 
-    const uint16_t tcp_port = 8082;
+    const uint16_t tcp_port = 7082;
     uint32_t index[] = { 1, 2, 3, 4 };
 
     struct Tox_Options *tox_options = tox_options_new(nullptr);
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
     // tox3 has UDP disabled and connects to tox1 via an HTTP proxy
     tox_options_set_udp_enabled(tox_options, false);
     tox_options_set_proxy_host(tox_options, "127.0.0.1");
-    tox_options_set_proxy_port(tox_options, 8080);
+    tox_options_set_proxy_port(tox_options, 7080);
     tox_options_set_proxy_type(tox_options, TOX_PROXY_TYPE_HTTP);
 
     Tox *tox3 = tox_new_log(tox_options, nullptr, &index[2]);
@@ -101,7 +101,7 @@ int main(int argc, char **argv)
     // tox4 has UDP disabled and connects to tox1 via a SOCKS5 proxy
     tox_options_set_udp_enabled(tox_options, false);
     tox_options_set_proxy_host(tox_options, "127.0.0.1");
-    tox_options_set_proxy_port(tox_options, 8081);
+    tox_options_set_proxy_port(tox_options, 7081);
     tox_options_set_proxy_type(tox_options, TOX_PROXY_TYPE_SOCKS5);
 
     Tox *tox4 = tox_new_log(tox_options, nullptr, &index[3]);

diff --git a/other/proxy/proxy_server.go b/other/proxy/proxy_server.go
@@ -15,8 +15,8 @@ import (
 
 const (
 	debug      = false
-	httpAddr   = ":8080"
-	socks5Addr = ":8081"
+	httpAddr   = ":7080"
+	socks5Addr = ":7081"
 )
 
 func handleTunneling(w http.ResponseWriter, r *http.Request) {