Skip to content

chore: Use new bazel script for circle ci. #2880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 20, 2025
Merged

chore: Use new bazel script for circle ci. #2880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .circleci/bazel-test
View file
Open in desktop

This file was deleted.

28 changes: 16 additions & 12 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ workflows:
circleci:
jobs:
- bazel-asan
- bazel-dbg
- bazel-debug
- bazel-msan
- bazel-opt
- bazel-release
- clang-analyze
- cpplint
- static-analysis
Expand All @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions auto_tests/proxy_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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]);
Expand All @@ -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]);
Expand Down
4 changes: 2 additions & 2 deletions other/proxy/proxy_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (

const (
debug = false
httpAddr = ":8080"
socks5Addr = ":8081"
httpAddr = ":7080"
socks5Addr = ":7081"
)

func handleTunneling(w http.ResponseWriter, r *http.Request) {
Expand Down
Loading