feat: Add more diff tests.

These help make sure all repos have the same configs.

.bazelrc

@@ -754,8 +754,8 @@ build:nix --build_tag_filters=-windows,-macos
 build:nix --test_tag_filters=-windows,-macos
 
 # Non-Nix local toolchains. Nix-Haskell doesn't work with local toolchains.
-build:local --build_tag_filters=-no-cross,-windows,-macos,-ui
-build:local --test_tag_filters=-no-cross,-windows,-macos,-ui
+build:local --build_tag_filters=-windows,-macos,-ui,-java,-javascript,-haskell,-no-cross
+build:local --test_tag_filters=-windows,-macos,-ui,-java,-javascript,-haskell,-no-cross
 
 build:zig-cross --copt=-fPIC
 build:zig-cross --dynamic_mode=off
@@ -768,22 +768,22 @@ build:zig-cross --per_file_copt='external/sdl2[:/]@-DICONV_INBUF_NONCONST=1'
 build:linux-arm64-musl --config=zig-cross
 build:linux-arm64-musl --platforms=@zig_sdk//platform:linux_arm64
 build:linux-arm64-musl --extra_toolchains=@zig_sdk//toolchain:linux_arm64_musl
-build:linux-arm64-musl --build_tag_filters=-no-cross,-qt,-windows,-macos,-java
-build:linux-arm64-musl --test_tag_filters=-no-cross,-qt,-windows,-macos,-java
+build:linux-arm64-musl --build_tag_filters=-windows,-macos,-java,-haskell,-javascript,-qt,-no-cross
+build:linux-arm64-musl --test_tag_filters=-windows,-macos,-java,-haskell,-javascript,-qt,-no-cross
 
 build:linux-x86_64-musl --config=zig-cross
 build:linux-x86_64-musl --platforms=@zig_sdk//platform:linux_amd64
 build:linux-x86_64-musl --extra_toolchains=@zig_sdk//toolchain:linux_amd64_musl
-build:linux-x86_64-musl --build_tag_filters=-no-cross,-qt,-windows,-macos
-build:linux-x86_64-musl --test_tag_filters=-no-cross,-qt,-windows,-macos
+build:linux-x86_64-musl --build_tag_filters=-windows,-macos,-java,-haskell,-javascript,-qt,-no-cross
+build:linux-x86_64-musl --test_tag_filters=-windows,-macos,-java,-haskell,-javascript,-qt,-no-cross
 build:linux-x86_64-musl --linkopt='-static'
 
 build:windows-x86_64 --config=zig-cross
 build:windows-x86_64 --linkopt="-lshlwapi"
 build:windows-x86_64 --platforms=@zig_sdk//platform:windows_amd64
 build:windows-x86_64 --extra_toolchains=@zig_sdk//toolchain:windows_amd64
-build:windows-x86_64 --build_tag_filters=-no-cross,-qt,-macos,-java,-no-windows
-build:windows-x86_64 --test_tag_filters=-no-cross,-qt,-macos,-java,-no-windows
+build:windows-x86_64 --build_tag_filters=-no-windows,-macos,-java,-haskell,-javascript,-qt,-no-cross
+build:windows-x86_64 --test_tag_filters=-no-windows,-macos,-java,-haskell,-javascript,-qt,-no-cross
 
 try-import %workspace%/.local.bazelrc
 

.github/workflows/ci.yml

@@ -42,60 +42,68 @@ jobs:
   docker-test:
     runs-on: ubuntu-22.04
     steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Build toxchat/toktok-stack:latest-third_party
-        run: docker build -t toxchat/toktok-stack:latest-third_party -f tools/built/src/Dockerfile.third_party .
+        run: docker compose build third_party
 
       - name: Build toxchat/toktok-stack:latest
-        run: docker build -t toxchat/toktok-stack:latest -f tools/built/src/Dockerfile .
+        run: docker compose build latest
 
-      - name: Build toxchat/toktok-stack:latest-msan
+      - name: Set up environment
         run: |
-          docker build -t toxchat/toktok-stack:latest-msan -f tools/built/src/Dockerfile.msan .
-          docker rmi toxchat/toktok-stack:latest-msan
-          docker system prune -f
+          echo "GROUP_ID=$(id -g)" >.env
+          echo "USER_ID=$(id -u)" >>.env
 
-      - name: Build toxchat/toktok-stack:latest-asan
+      - name: Build for msan
         run: |
-          docker build -t toxchat/toktok-stack:latest-asan -f tools/built/src/Dockerfile.asan .
-          docker rmi toxchat/toktok-stack:latest-asan
-          docker system prune -f
+          tar -C .. -xf <(curl -L https://github.com/TokTok/toktok-stack/releases/download/nightly/msan.tar)
+          docker compose run --rm msan
+          docker kill bazel-cache
+          rm -rf ../bazel-cache
 
-      - name: Build toxchat/toktok-stack:latest-release
+      - name: Build for asan
         run: |
-          docker build -t toxchat/toktok-stack:latest-release -f tools/built/src/Dockerfile.release .
-          docker rmi toxchat/toktok-stack:latest-release
-          docker system prune -f
+          tar -C .. -xf <(curl -L https://github.com/TokTok/toktok-stack/releases/download/nightly/asan.tar)
+          docker compose run --rm asan
+          docker kill bazel-cache
+          rm -rf ../bazel-cache
 
-      - name: Build toxchat/toktok-stack:latest-arm64
+      - name: Build for release
         run: |
-          docker build -t toxchat/toktok-stack:latest-arm64 -f tools/built/src/Dockerfile.arm64 .
-          docker rmi toxchat/toktok-stack:latest-arm64
-          docker system prune -f
+          tar -C .. -xf <(curl -L https://github.com/TokTok/toktok-stack/releases/download/nightly/release.tar)
+          docker compose run --rm release
+          docker kill bazel-cache
+          rm -rf ../bazel-cache
 
-      - name: Build toxchat/toktok-stack:latest-windows
+      - name: Build for arm64
         run: |
-          docker build -t toxchat/toktok-stack:latest-windows -f tools/built/src/Dockerfile.windows .
-          docker rmi toxchat/toktok-stack:latest-windows
-          docker system prune -f
+          tar -C .. -xf <(curl -L https://github.com/TokTok/toktok-stack/releases/download/nightly/arm64.tar)
+          docker compose run --rm arm64
+          docker kill bazel-cache
+          rm -rf ../bazel-cache
 
-      - name: Build toxchat/toktok-stack:latest-fastbuild
-        run: docker build -t toxchat/toktok-stack:latest-fastbuild -f tools/built/src/Dockerfile.fastbuild .
+      - name: Build for windows
+        run: |
+          tar -C .. -xf <(curl -L https://github.com/TokTok/toktok-stack/releases/download/nightly/windows.tar)
+          docker compose run --rm windows
+          docker kill bazel-cache
+          rm -rf ../bazel-cache
 
-      - name: Build toxchat/toktok-stack:latest-dev
+      - name: Build for fastbuild
         run: |
-          sed -i -e 's/ --remote_download_outputs=all//' tools/built/src/setup-dev.sh
-          docker build -t toxchat/toktok-stack:latest-dev -f tools/built/src/Dockerfile.dev .
+          tar -C .. -xf <(curl -L https://github.com/TokTok/toktok-stack/releases/download/nightly/fastbuild.tar)
+          docker compose run --rm fastbuild
+          docker kill bazel-cache
+          rm -rf ../bazel-cache
+
+      - name: Build toxchat/toktok-stack:latest-dev
+        run: docker build -t toxchat/toktok-stack:latest-dev -f tools/built/src/Dockerfile.dev .
 
   local-build:
     runs-on: ubuntu-24.04
-    # if: false
     env:
       CC: clang
       CXX: clang++
@@ -121,7 +129,7 @@ jobs:
         run: |
           . /home/runner/.nix-profile/etc/profile.d/nix.sh
           nix-shell -p patchelf --run "patchelf --version"
-          bazel test --config=local --config=remote -- //... -//jvm-toxcore-c/... -//third_party/...
+          bazel test --config=ci --config=local --config=remote -- //... -//jvm-toxcore-c/... -//third_party/...
 
   macos:
     runs-on: macos-14

.github/workflows/docker.yml

@@ -68,29 +68,9 @@ jobs:
           cache-to: type=inline
           push: true
 
-  docker-fastbuild:
-    runs-on: ubuntu-22.04
-    needs: [docker]
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          file: tools/built/src/Dockerfile.fastbuild
-          tags: toxchat/toktok-stack:latest-fastbuild
-          cache-from: type=registry,ref=toxchat/toktok-stack:latest-fastbuild
-          cache-to: type=inline
-          push: true
-
   docker-dev:
     runs-on: ubuntu-22.04
-    needs: [docker-fastbuild]
+    needs: [docker]
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -108,26 +88,30 @@ jobs:
           cache-to: type=inline
           push: true
 
-  docker-built:
+  bazel-cache:
     strategy:
       fail-fast: false
       matrix:
-        flavour: [release, debug, asan, msan, tsan, arm64, windows]
+        flavour: [fastbuild, release, debug, asan, msan, tsan, arm64, windows]
     runs-on: ubuntu-22.04
     needs: [docker]
     steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
+      - name: Set up environment
+        run: |
+          echo "GROUP_ID=$(id -g)" >.env
+          echo "USER_ID=$(id -u)" >>.env
+      - name: Download current cache and run the build
+        run: |
+          tar -C .. -xf <(curl -L https://github.com/TokTok/toktok-stack/releases/download/nightly/${{ matrix.flavour }}.tar) || mkdir -p ../bazel-cache
+          docker compose run --rm ${{ matrix.flavour }}
+          tar -C .. -cf ${{ matrix.flavour }}.tar bazel-cache
+      - name: Upload updated cache to nightly release
+        uses: ncipollo/release-action@v1
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          file: tools/built/src/Dockerfile.${{ matrix.flavour }}
-          tags: toxchat/toktok-stack:latest-${{ matrix.flavour }}
-          cache-from: type=registry,ref=toxchat/toktok-stack:latest-${{ matrix.flavour }}
-          cache-to: type=inline
-          push: true
+          allowUpdates: true
+          tag: nightly
+          omitBodyDuringUpdate: true
+          omitNameDuringUpdate: true
+          prerelease: true
+          replacesArtifacts: true
+          artifacts: ${{ matrix.flavour }}.tar

.gitignore

@@ -1,13 +1,15 @@
 # Build artifacts.
 /.cache
 /.clangd
+/.env
 /.vs
 /.vscode
 /.stack-work
 /stack.yaml.lock
 /bazel-*
 /cov-analysis*
 /external
+/go.work.sum
 /toolchain
 /MODULE.bazel.lock
 *.log

compose.yml

@@ -0,0 +1,79 @@
+x-shared-params: &shared_params
+  container_name: bazel-build
+  depends_on:
+    - bazel-cache
+  build:
+    context: .
+    dockerfile: tools/built/src/Dockerfile
+  image: toxchat/toktok-stack:latest
+  environment:
+    HOME: /home/builder
+
+services:
+  bazel-cache:
+    user: ${USER_ID}:${GROUP_ID}
+    container_name: bazel-cache
+    image: buchgr/bazel-remote-cache
+    restart: on-failure
+    ports:
+      - "9092:9092"
+    command: --max_size=1
+    volumes:
+      - ../bazel-cache:/data
+    environment:
+      BAZEL_REMOTE_GRPC_PORT: 9092
+  third_party:
+    build:
+      context: .
+      dockerfile: tools/built/src/Dockerfile.third_party
+    image: toxchat/toktok-stack:latest-third_party
+
+  latest:
+    <<: *shared_params
+
+  fastbuild:
+    <<: *shared_params
+    command: bazel test
+      --remote_cache=grpc://bazel-cache:9092
+      //...
+
+  arm64:
+    <<: *shared_params
+    command: bazel build
+      --remote_cache=grpc://bazel-cache:9092
+      --config=linux-arm64-musl
+      //...
+
+  asan:
+    <<: *shared_params
+    command: bazel test
+      --remote_cache=grpc://bazel-cache:9092
+      --config=asan
+      --build_tag_filters=-haskell,-fuzz-test
+      --test_tag_filters=-haskell,-fuzz-test
+      //c-toxcore/...
+
+  msan:
+    <<: *shared_params
+    command: bazel test
+      --remote_cache=grpc://bazel-cache:9092
+      --config=msan
+      --build_tag_filters=-haskell,-fuzz-test
+      --test_tag_filters=-haskell,-fuzz-test
+      --
+      //c-toxcore/auto_tests/...
+      -//c-toxcore/auto_tests:proxy_test
+
+  release:
+    <<: *shared_params
+    command: bazel test
+      --remote_cache=grpc://bazel-cache:9092
+      --config=release
+      //...
+
+  windows:
+    <<: *shared_params
+    command: bazel build
+      --remote_cache=grpc://bazel-cache:9092
+      --config=windows-x86_64
+      //...

cspell.config.yaml

@@ -10,17 +10,26 @@ words:
   - blargh
   - blyat
   - blyatyfy
+  - buildifier
   - buildx
   - ccache
   - choco
   - citri
+  - codesign
+  - createdmg
   - depfile
+  - depset
+  - diffutils
   - dockerfiles
   - dryrun
   - dups
   - endforeach
   - fastbuild
   - flathub
+  - fmap
+  - genrule
+  - gitmodules
+  - hditool
   - icotool
   - libc
   - libfuzzer
@@ -30,6 +39,7 @@ words:
   - magick
   - makensis
   - mempty
+  - mkstamp
   - mypy
   - ncipollo
   - nixpkgs
@@ -38,7 +48,11 @@ words:
   - qtox
   - qttools
   - realpath
+  - rfind
+  - runfiles
   - sqlcipher
+  - srcs
+  - startswith
   - teehee
   - toktok
   - toplevel