diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d2206c2..7046fe71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,74 +16,77 @@ jobs: common: uses: TokTok/ci-tools/.github/workflows/common-ci.yml@master - hie-bios: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - name: "Generate HIE BIOS output and haskell_targets.bzl" - run: tools/haskell/hie-docker - - name: "Verify that haskell_targets.bzl didn't change" - run: git diff --exit-code - - docker-haskell: - runs-on: ubuntu-22.04 - steps: - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Build toxchat/toktok-stack:haskell - uses: docker/build-push-action@v5 - with: - file: tools/built/src/Dockerfile.haskell - tags: toxchat/toktok-stack:haskell - cache-from: type=registry,ref=toxchat/toktok-stack:haskell - - 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 . - - - name: Build toxchat/toktok-stack:latest - run: docker build -t toxchat/toktok-stack:latest -f tools/built/src/Dockerfile . - - - name: Build toxchat/toktok-stack:latest-asan - 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 - - - name: Build toxchat/toktok-stack:latest-arm64 - 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 - - - name: Build toxchat/toktok-stack:latest-windows - 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 - - - name: Build toxchat/toktok-stack:latest-fastbuild - run: docker build -t toxchat/toktok-stack:latest-fastbuild -f tools/built/src/Dockerfile.fastbuild . - - - name: Build toxchat/toktok-stack:latest-dev - 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 . + # hie-bios: + # runs-on: ubuntu-22.04 + # steps: + # - uses: actions/checkout@v4 + # with: + # submodules: recursive + # - name: "Generate HIE BIOS output and haskell_targets.bzl" + # run: tools/haskell/hie-docker + # - name: "Verify that haskell_targets.bzl didn't change" + # run: git diff --exit-code + + # docker-haskell: + # runs-on: ubuntu-22.04 + # steps: + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v3 + # - name: Build toxchat/toktok-stack:haskell + # uses: docker/build-push-action@v5 + # with: + # file: tools/built/src/Dockerfile.haskell + # tags: toxchat/toktok-stack:haskell + # cache-from: type=registry,ref=toxchat/toktok-stack:haskell + + # 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 . + + # - name: Build toxchat/toktok-stack:latest + # run: docker build -t toxchat/toktok-stack:latest -f tools/built/src/Dockerfile . + + # - name: Build toxchat/toktok-stack:latest-asan + # 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 + + # - name: Build toxchat/toktok-stack:latest-arm64 + # 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 + + # - name: Build toxchat/toktok-stack:latest-windows + # 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 + + # - name: Build toxchat/toktok-stack:latest-fastbuild + # run: docker build -t toxchat/toktok-stack:latest-fastbuild -f tools/built/src/Dockerfile.fastbuild . + + # - name: Build toxchat/toktok-stack:latest-dev + # 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 . local-build: - runs-on: ubuntu-22.04 - if: false + runs-on: ubuntu-24.04 + # if: false + env: + CC: clang + CXX: clang++ steps: - uses: actions/checkout@v4 with: @@ -104,17 +107,17 @@ jobs: run: | . /home/runner/.nix-profile/etc/profile.d/nix.sh nix-shell -p patchelf --run "patchelf --version" - bazel build --config=local //... - - mypy: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - name: Set up Python 3.9 - uses: actions/setup-python@v5 - with: - python-version: 3.9 - - name: Install mypy - run: pip install mypy - - name: Run mypy - run: make mypy + bazel test --config=local --config=remote -- //... -//jvm-toxcore-c/... -//third_party/... + + # mypy: + # runs-on: ubuntu-22.04 + # steps: + # - uses: actions/checkout@v4 + # - name: Set up Python 3.9 + # uses: actions/setup-python@v5 + # with: + # python-version: 3.9 + # - name: Install mypy + # run: pip install mypy + # - name: Run mypy + # run: make mypy diff --git a/c-toxcore b/c-toxcore index 0f12f384..e9bf524d 160000 --- a/c-toxcore +++ b/c-toxcore @@ -1 +1 @@ -Subproject commit 0f12f384c8cf62310b9cff6c31e94af7126b7478 +Subproject commit e9bf524d9e18e69288a7d7980bc6f67d7976d4de diff --git a/qtox b/qtox index 823fde42..f0ebe501 160000 --- a/qtox +++ b/qtox @@ -1 +1 @@ -Subproject commit 823fde429a7a014868f532c2877cf80388af67e9 +Subproject commit f0ebe5012dbdae12fbe07d38ff0ff5a0ada1acdf