Skip to content

Commit

Permalink
chore(deps): Bump c-toxcore from 1224e65 to 5407384
Browse files Browse the repository at this point in the history
Bumps [c-toxcore](https://github.com/TokTok/c-toxcore) from `1224e65` to `5407384`.
- [Release notes](https://github.com/TokTok/c-toxcore/releases)
- [Commits](TokTok/c-toxcore@1224e65...5407384)

---
updated-dependencies:
- dependency-name: c-toxcore
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
dependabot[bot] authored and iphydf committed Dec 28, 2023
1 parent 5316cec commit 80d1fbc
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 49 deletions.
27 changes: 9 additions & 18 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ build --experimental_inmemory_jdeps_files
build --experimental_objc_include_scanning
build --experimental_omitfp
build --experimental_remotable_source_manifests
#build --experimental_remote_build_event_upload=minimal
build --experimental_remote_build_event_upload=minimal
build --experimental_remote_cache_async
build --experimental_remote_merkle_tree_cache
#build --experimental_remote_require_cached # needs newer bazel version
Expand Down Expand Up @@ -95,25 +95,15 @@ build:remote --remote_cache=grpc://code.tox.chat:9092

# Use remote execution. Disabled by default, because we don't want everyone to
# use the remote executors (and they might be down sometimes).
build:remote-exec --remote_executor=grpc://code.tox.chat:8980
#build:remote-exec --remote_executor=grpc://code.tox.chat:8980
build:remote-exec --remote_executor=grpc://10.100.0.1:8980

# Use local docker sandbox. This is a lot slower than linux-sandbox, but is more
# hermetic and reproducible, so it is used on our CI.
build:docker-sandbox --experimental_docker_image=toxchat/builder:latest
build:docker-sandbox --experimental_docker_verbose
build:docker-sandbox --experimental_enable_docker_sandbox
build:docker-sandbox --define=EXECUTOR=remote
# The remote executor doesn't have everything available, so we consider it the
# same as cross compilation.
build:remote-exec --build_tag_filters=-no-cross,-macos,-windows

build:docker-sandbox --genrule_strategy=docker
build:docker-sandbox --spawn_strategy=docker
build:docker-sandbox --strategy=Javac=docker

# Use sandboxfs, which is much faster than docker, but slightly less hermetic.
#
# TODO(https://github.com/tweag/rules_haskell/issues/1265): Enable this by
# default once rules_haskell supports it.
build:sandboxfs --experimental_sandboxfs_path=/home/builder/.bin/sandboxfs
build:sandboxfs --experimental_use_sandboxfs
# Without this, the build farm needs to have *all* build artifacts in its CAS.
build:remote-exec --remote_download_outputs=all

##############################################################################
#
Expand Down Expand Up @@ -584,6 +574,7 @@ build:windows-x86_64 --build_tag_filters=-no-cross,-macos
#build --config=linux-arm64-musl
#build --config=linux-x86_64-musl
#build --config=windows-x86_64
#build --config=remote-exec
build --config=nix

try-import %workspace%/.bazelrc.local
Expand Down
1 change: 1 addition & 0 deletions .hie-bios
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import sys

if "--regenerate" in sys.argv:
subprocess.run(["tools/haskell/gen_haskell_targets"], check=True)
subprocess.run(["bazel", "build", "//tools/haskell:hie-bios@bios"], check=True)
result = subprocess.run(
[
"bazel", "run", "//tools/haskell:hie-bios@bios",
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles
Submodule dockerfiles updated 46 files
+14 −2 .github/settings.yml
+30 −382 .github/workflows/docker.yml
+1 −0 .hadolint.yaml
+0 −2 Makefile
+22 −0 bazel-cache/Dockerfile
+0 −0 bazel/.dockerignore
+0 −0 bazel/.gitignore
+0 −0 bazel/Dockerfile
+0 −0 bazel/README.md
+0 −0 bazel/arion-compose.nix
+0 −0 bazel/arion-pkgs.nix
+0 −0 bazel/build.sh
+0 −0 bazel/ssh-keys.nix
+0 −44 buildfarm/Makefile
+0 −37 buildfarm/base/Dockerfile
+0 −16 buildfarm/cache/Dockerfile
+19 −0 buildfarm/compose.yml
+11 −0 buildfarm/config.yml
+10 −0 buildfarm/default.nix
+2 −0 buildfarm/server.Dockerfile
+0 −9 buildfarm/server/Dockerfile
+0 −13 buildfarm/server/entrypoint.sh
+0 −10 buildfarm/server/logging.properties
+0 −80 buildfarm/server/server.config
+28 −0 buildfarm/worker.Dockerfile
+0 −8 buildfarm/worker/Dockerfile
+0 −15 buildfarm/worker/entrypoint.sh
+0 −10 buildfarm/worker/logging.properties
+0 −185 buildfarm/worker/worker.config
+0 −0 flutter-web/Dockerfile
+0 −1 windows-qt5/.gitignore
+0 −44 windows-qt5/configure
+0 −3 windows-qt5/i686-shared/.gitignore
+0 −3 windows-qt5/i686-static/.gitignore
+0 −46 windows-qt5/src/Dockerfile.in
+0 −13 windows-qt5/src/patches/sqlcipher.patch
+0 −3 windows-qt5/x86_64-shared/.gitignore
+0 −3 windows-qt5/x86_64-static/.gitignore
+0 −1 windows/.gitignore
+0 −35 windows/configure
+0 −3 windows/i686-shared/.gitignore
+0 −3 windows/i686-static/.gitignore
+0 −83 windows/src/Dockerfile.in
+0 −5 windows/src/settings.mk.in
+0 −3 windows/x86_64-shared/.gitignore
+0 −3 windows/x86_64-static/.gitignore
2 changes: 1 addition & 1 deletion experimental
2 changes: 1 addition & 1 deletion hs-tokstyle
Submodule hs-tokstyle updated 1 files
+2 −0 doc/BUILD.bazel
2 changes: 1 addition & 1 deletion hs-toxcore
2 changes: 1 addition & 1 deletion hs-toxcore-c
Submodule hs-toxcore-c updated 1 files
+1 −0 BUILD.bazel
2 changes: 1 addition & 1 deletion qtox
Submodule qtox updated 1 files
+4 −0 BUILD.bazel
1 change: 0 additions & 1 deletion third_party/BUILD.ncurses
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ genrule(
tools = [":make_hash"],
)

# TODO(iphydf): Build ncurses in bazel.
cc_library(
name = "ncurses",
srcs = [
Expand Down
1 change: 1 addition & 0 deletions third_party/haskell/alex/build_defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ def alex_lexer(name, src):
"-o $(location %s)" % out,
"$(location %s)" % src,
]),
tags = ["no-cross"],
tools = [_ALEX],
)
2 changes: 2 additions & 0 deletions third_party/haskell/happy/build_defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def happy_parser(name, src, glr = False, preproc = None, preproc_tool = None):
"$<",
"$@",
]),
tags = ["no-cross"],
tools = [preproc] + ([preproc_tool] if preproc_tool else []),
)
src = pp_src
Expand All @@ -47,5 +48,6 @@ def happy_parser(name, src, glr = False, preproc = None, preproc_tool = None):
"-o $(location %s)" % driver_out,
"$(location %s)" % src,
] + happy_flags),
tags = ["no-cross"],
tools = [_HAPPY],
)
2 changes: 2 additions & 0 deletions third_party/haskell/hspec-discover/build_defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def hspec_library(name, src_strip_prefix, **kwargs):
module_name = module_name,
),
]),
tags = ["no-cross"],
tools = [_HSPEC_DISCOVER],
)

Expand All @@ -51,6 +52,7 @@ def hspec_test(name, visibility=["//tools/haskell:__pkg__"], **kwargs):
"cd %s/test" % native.package_name(),
"../../$(location %s) $$(basename $@) Main.hs ../../$@" % _HSPEC_DISCOVER,
]),
tags = ["no-cross"],
tools = [_HSPEC_DISCOVER],
)

Expand Down
3 changes: 2 additions & 1 deletion third_party/python/build_defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ def pyx_library(
),
"cp -r %s/* $(RULEDIR)" % native.package_name(),
]),
tools = ["@cython//:cython"] + pxd_srcs,
tags = tags,
tools = ["@cython//:cython"],
)

# Compile the C code to shared objects.
Expand Down
3 changes: 2 additions & 1 deletion third_party/qt/build_defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,9 @@ def qt_test(name, src, deps, copts = [], mocopts = [], size = None, **kwargs):
qt_moc(
name = "%s_moc_src" % name,
srcs = [src],
deps = deps,
mocopts = ["-Iqtox"],
tags = ["no-cross"],
deps = deps,
)
cc_library(
name = "%s_moc" % name,
Expand Down
2 changes: 1 addition & 1 deletion tools/haskell/gen_haskell_targets
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ OUT=tools/haskell/haskell_targets.bzl

echo "# Generated by $0 > $OUT" >"$OUT.new"
echo 'HASKELL_TARGETS = [' >>"$OUT.new"
bazel query 'visible(//tools/haskell:hie-bios, kind(haskell_library, //...) union kind(haskell_binary, //...) union kind(haskell_test, //...))' |
bazel query 'visible(//tools/haskell:hie-bios, kind(haskell_library, //...) union kind(haskell_test, //...))' |
sed -e 's/^/ "/;s/$/",/' \
>>"$OUT.new"
echo ']' >>"$OUT.new"
Expand Down
20 changes: 0 additions & 20 deletions tools/haskell/haskell_targets.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ HASKELL_TARGETS = [
"//c-toxcore-hs:c-toxcore-hs",
"//hs-apigen:hs-apigen",
"//hs-apigen:testsuite",
"//hs-apigen/tools:apigen",
"//hs-cimple:ast",
"//hs-cimple:comment-parser",
"//hs-cimple:describe-ast",
Expand All @@ -12,27 +11,14 @@ HASKELL_TARGETS = [
"//hs-cimple:parser",
"//hs-cimple:testsuite",
"//hs-cimple:tree-parser",
"//hs-cimple/tools:cimplefmt",
"//hs-cimple/tools:count-tokens",
"//hs-cimple/tools:dump-ast",
"//hs-cimple/tools:dump-tokens",
"//hs-cimple/tools:include-graph",
"//hs-github-tools:github-base",
"//hs-github-tools:github-events",
"//hs-github-tools:hs-github-tools",
"//hs-github-tools:testsuite",
"//hs-github-tools/tools:hub-automerge",
"//hs-github-tools/tools:hub-changelog",
"//hs-github-tools/tools:hub-graph",
"//hs-github-tools/tools:hub-pulls",
"//hs-github-tools/tools:hub-roadmap",
"//hs-github-tools/web:webservice",
"//hs-msgpack-arbitrary:hs-msgpack-arbitrary",
"//hs-msgpack-arbitrary:testsuite",
"//hs-msgpack-binary:hs-msgpack-binary",
"//hs-msgpack-binary:testsuite",
"//hs-msgpack-binary/tools:msgpack-gen-sample",
"//hs-msgpack-binary/tools:msgpack-parser",
"//hs-msgpack-rpc-conduit:hs-msgpack-rpc-conduit",
"//hs-msgpack-rpc-conduit:testsuite",
"//hs-msgpack-testsuite:hs-msgpack-testsuite",
Expand All @@ -44,15 +30,9 @@ HASKELL_TARGETS = [
"//hs-tokstyle:c-linters",
"//hs-tokstyle:hs-tokstyle",
"//hs-tokstyle:testsuite",
"//hs-tokstyle/tools:check-c",
"//hs-tokstyle/tools:check-cimple",
"//hs-tokstyle/web:webservice",
"//hs-toxcore:hs-toxcore",
"//hs-toxcore:testsuite",
"//hs-toxcore-c:hs-toxcore-c",
"//hs-toxcore-c:testsuite",
"//hs-toxcore-c/tools:groupbot",
"//hs-toxcore/tools:toxsave-convert",
"//hs-toxcore/tools:toxsave-test",
"//hs-toxcore/web:webservice",
]

0 comments on commit 80d1fbc

Please sign in to comment.