StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

chore: Use toktok-stack docker image with built third_party.

Browse Source 
This should cut down the build time a bit by downloading the binaries
built for `//third_party/...`.
This commit is contained in:
iphydf 2021-12-03 16:20:10 +00:00
parent 0320e2eb8e
commit af1848ed13
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
6 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.cirrus.yml
View File

@ -1,16 +1,13 @@
--- ---
cirrus-ci_task: cirrus-ci_task:
container: container:
image: toxchat/toktok-stack:0.0.18 image: toxchat/toktok-stack:0.0.23-third_party
cpu: 2 cpu: 2
memory: 2G memory: 2G
configure_script: configure_script:
- /src/workspace/tools/inject-repo c-toxcore - /src/workspace/tools/inject-repo c-toxcore
# Work around "FATAL: corrupt installation: file '/home/builder/.cache/bazel/_bazel_builder/install/f439a981a1e06f45be981c123f9858d5/A-server.jar' is missing or modified"
# Clearing the cache through the Cirrus web UI doesn't fix, but this does.
- rm -rf /home/builder/.cache/bazel/
test_all_script: test_all_script:
- bazel test -k - cd /src/workspace && bazel test -k
--remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
--build_tag_filters=-haskell --build_tag_filters=-haskell
--test_tag_filters=-haskell --test_tag_filters=-haskell
@ -22,15 +19,16 @@ cirrus-ci_task:
cimple_task: cimple_task:
container: container:
image: toxchat/toktok-stack:0.0.18 image: toxchat/toktok-stack:0.0.23-third_party
cpu: 2 cpu: 2
memory: 4G memory: 4G
configure_script: configure_script:
- /src/workspace/tools/inject-repo c-toxcore - /src/workspace/tools/inject-repo c-toxcore
test_all_script: test_all_script:
- bazel test -k - cd /src/workspace && bazel test -k
--remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
--build_tag_filters=haskell --build_tag_filters=haskell
--test_tag_filters=haskell --test_tag_filters=haskell
--config=release
-- --
//c-toxcore/... //c-toxcore/...

2
toxav/toxav.c
View File

@ -24,7 +24,7 @@
// TODO(zoff99): don't hardcode this, let the application choose it // TODO(zoff99): don't hardcode this, let the application choose it
// VPX Info: Time to spend encoding, in microseconds (it's a *soft* deadline) // VPX Info: Time to spend encoding, in microseconds (it's a *soft* deadline)
#define WANTED_MAX_ENCODER_FPS (40) #define WANTED_MAX_ENCODER_FPS 40
#define MAX_ENCODE_TIME_US (1000000 / WANTED_MAX_ENCODER_FPS) // to allow x fps #define MAX_ENCODE_TIME_US (1000000 / WANTED_MAX_ENCODER_FPS) // to allow x fps
#define VIDEO_SEND_X_KEYFRAMES_FIRST 7 // force the first n frames to be keyframes! #define VIDEO_SEND_X_KEYFRAMES_FIRST 7 // force the first n frames to be keyframes!

2
toxcore/DHT.h
View File

@ -24,7 +24,7 @@ extern "C" {
/* Maximum number of clients stored per friend. */ /* Maximum number of clients stored per friend. */
#define MAX_FRIEND_CLIENTS 8 #define MAX_FRIEND_CLIENTS 8
#define LCLIENT_NODES (MAX_FRIEND_CLIENTS) #define LCLIENT_NODES MAX_FRIEND_CLIENTS
#define LCLIENT_LENGTH 128 #define LCLIENT_LENGTH 128
/* A list of the clients mathematically closest to ours. */ /* A list of the clients mathematically closest to ours. */

2
toxcore/TCP_connection.h
View File

@ -27,7 +27,7 @@
#define MAX_FRIEND_TCP_CONNECTIONS 6 #define MAX_FRIEND_TCP_CONNECTIONS 6
/* Time until connection to friend gets killed (if it doesn't get locked within that time) */ /* Time until connection to friend gets killed (if it doesn't get locked within that time) */
#define TCP_CONNECTION_ANNOUNCE_TIMEOUT (TCP_CONNECTION_TIMEOUT) #define TCP_CONNECTION_ANNOUNCE_TIMEOUT TCP_CONNECTION_TIMEOUT
/* The amount of recommended connections for each friend /* The amount of recommended connections for each friend
* NOTE: Must be at most (MAX_FRIEND_TCP_CONNECTIONS / 2) */ * NOTE: Must be at most (MAX_FRIEND_TCP_CONNECTIONS / 2) */

2
toxcore/friend_connection.h
View File

@ -34,7 +34,7 @@
#define FRIEND_MAX_STORED_TCP_RELAYS (MAX_FRIEND_TCP_CONNECTIONS * 4) #define FRIEND_MAX_STORED_TCP_RELAYS (MAX_FRIEND_TCP_CONNECTIONS * 4)
/* Max number of tcp relays sent to friends */ /* Max number of tcp relays sent to friends */
#define MAX_SHARED_RELAYS (RECOMMENDED_FRIEND_TCP_CONNECTIONS) #define MAX_SHARED_RELAYS RECOMMENDED_FRIEND_TCP_CONNECTIONS
/* Interval between the sending of tcp relay information */ /* Interval between the sending of tcp relay information */
#define SHARE_RELAYS_INTERVAL (5 * 60) #define SHARE_RELAYS_INTERVAL (5 * 60)

2
toxcore/network.c
View File

@ -310,7 +310,7 @@ IP6 get_ip6_loopback(void)
} }
#ifndef OS_WIN32 #ifndef OS_WIN32
#define INVALID_SOCKET -1 #define INVALID_SOCKET (-1)
#endif #endif
const Socket net_invalid_socket = { (int)INVALID_SOCKET }; const Socket net_invalid_socket = { (int)INVALID_SOCKET };