Skip to content

Commit 199878f

Browse files
committed
chore: Use new bazel script for circle ci.
1 parent 8278e9c commit 199878f

File tree

4 files changed

+21
-29
lines changed

4 files changed

+21
-29
lines changed

Diff for: .circleci/bazel-test

-12
This file was deleted.

Diff for: .circleci/config.yml

+16-12
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ workflows:
66
circleci:
77
jobs:
88
- bazel-asan
9-
- bazel-dbg
9+
- bazel-debug
1010
- bazel-msan
11-
- bazel-opt
11+
- bazel-release
1212
- clang-analyze
1313
- cpplint
1414
- static-analysis
@@ -20,41 +20,45 @@ jobs:
2020
bazel-asan:
2121
working_directory: /tmp/cirrus-ci-build
2222
docker:
23-
- image: toxchat/toktok-stack:latest-asan
23+
- image: toxchat/toktok-stack:latest
2424

2525
steps:
2626
- checkout
27-
- run: .circleci/bazel-test
27+
- run: bash <(curl -s https://raw.githubusercontent.com/TokTok/ci-tools/refs/heads/master/tools/circleci-bazel-test)
28+
--build_tag_filters=-haskell,-fuzz-test
29+
--test_tag_filters=-haskell,-fuzz-test
2830
//c-toxcore/...
2931

30-
bazel-dbg:
32+
bazel-debug:
3133
working_directory: /tmp/cirrus-ci-build
3234
docker:
33-
- image: toxchat/toktok-stack:latest-debug
35+
- image: toxchat/toktok-stack:latest
3436

3537
steps:
3638
- checkout
37-
- run: .circleci/bazel-test
39+
- run: bash <(curl -s https://raw.githubusercontent.com/TokTok/ci-tools/refs/heads/master/tools/circleci-bazel-test)
40+
--build_tag_filters=-haskell
41+
--test_tag_filters=-haskell
3842
//c-toxcore/...
3943

4044
bazel-msan:
4145
working_directory: /tmp/cirrus-ci-build
4246
docker:
43-
- image: toxchat/toktok-stack:latest-msan
47+
- image: toxchat/toktok-stack:latest
4448

4549
steps:
4650
- checkout
47-
- run: .circleci/bazel-test
51+
- run: bash <(curl -s https://raw.githubusercontent.com/TokTok/ci-tools/refs/heads/master/tools/circleci-bazel-test)
4852
//c-toxcore/auto_tests:lossless_packet_test
4953

50-
bazel-opt:
54+
bazel-release:
5155
working_directory: /tmp/cirrus-ci-build
5256
docker:
53-
- image: toxchat/toktok-stack:latest-release
57+
- image: toxchat/toktok-stack:latest
5458

5559
steps:
5660
- checkout
57-
- run: .circleci/bazel-test
61+
- run: bash <(curl -s https://raw.githubusercontent.com/TokTok/ci-tools/refs/heads/master/tools/circleci-bazel-test)
5862
//c-toxcore/...
5963

6064
static-analysis:

Diff for: auto_tests/proxy_test.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
6060
c_sleep(100);
6161
}
6262

63-
const uint16_t tcp_port = 8082;
63+
const uint16_t tcp_port = 7082;
6464
uint32_t index[] = { 1, 2, 3, 4 };
6565

6666
struct Tox_Options *tox_options = tox_options_new(nullptr);
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
9292
// tox3 has UDP disabled and connects to tox1 via an HTTP proxy
9393
tox_options_set_udp_enabled(tox_options, false);
9494
tox_options_set_proxy_host(tox_options, "127.0.0.1");
95-
tox_options_set_proxy_port(tox_options, 8080);
95+
tox_options_set_proxy_port(tox_options, 7080);
9696
tox_options_set_proxy_type(tox_options, TOX_PROXY_TYPE_HTTP);
9797

9898
Tox *tox3 = tox_new_log(tox_options, nullptr, &index[2]);
@@ -101,7 +101,7 @@ int main(int argc, char **argv)
101101
// tox4 has UDP disabled and connects to tox1 via a SOCKS5 proxy
102102
tox_options_set_udp_enabled(tox_options, false);
103103
tox_options_set_proxy_host(tox_options, "127.0.0.1");
104-
tox_options_set_proxy_port(tox_options, 8081);
104+
tox_options_set_proxy_port(tox_options, 7081);
105105
tox_options_set_proxy_type(tox_options, TOX_PROXY_TYPE_SOCKS5);
106106

107107
Tox *tox4 = tox_new_log(tox_options, nullptr, &index[3]);

Diff for: other/proxy/proxy_server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515

1616
const (
1717
debug = false
18-
httpAddr = ":8080"
19-
socks5Addr = ":8081"
18+
httpAddr = ":7080"
19+
socks5Addr = ":7081"
2020
)
2121

2222
func handleTunneling(w http.ResponseWriter, r *http.Request) {

0 commit comments

Comments
 (0)