From a3f94a35687dc299a8816f1389602b3b2c1ff444 Mon Sep 17 00:00:00 2001 From: seaubot Date: Thu, 28 Mar 2024 00:22:15 +0000 Subject: [PATCH] chore: sync with ecsact_common --- .bazelversion | 2 +- .github/workflows/main.yml | 12 ++++-------- bazel/common.bazelrc | 1 - bazel/copts.bzl | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.bazelversion b/.bazelversion index 91e4a9f..a3fcc71 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.3.2 +7.1.0 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a6a2e3f..c7dc061 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,14 +14,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: jidicula/clang-format-action@v4.9.0 - with: { clang-format-version: "16" } + - uses: jidicula/clang-format-action@v4.11.0 + with: { clang-format-version: "18" } test-windows: runs-on: windows-latest steps: - - uses: wasmerio/setup-wasmer@v2 - - uses: ecsact-dev/github-action@0.1.0 - uses: actions/cache@v3 with: path: | @@ -29,16 +27,14 @@ jobs: /Users/runneradmin/.cache/bazel-disk-cache key: ${{runner.os}}-bazel-cache - uses: actions/checkout@v4 - - run: bazelisk --output_user_root=C:/tmp build --config=ci //... + - run: bazelisk build --config=ci //... - if: ${{ hashfiles('test/MODULE.bazel') != '' }} - run: bazelisk --output_user_root=C:/tmp test --config=ci ... + run: bazelisk test --config=ci ... working-directory: test test-linux: runs-on: ubuntu-latest steps: - - uses: wasmerio/setup-wasmer@v2 - - uses: ecsact-dev/github-action@0.1.0 - uses: actions/cache@v3 with: path: | diff --git a/bazel/common.bazelrc b/bazel/common.bazelrc index ebb4c3e..50ddd64 100644 --- a/bazel/common.bazelrc +++ b/bazel/common.bazelrc @@ -4,7 +4,6 @@ common --registry=https://raw.githubusercontent.com/ecsact-dev/bazel_registry/ma common --registry=https://raw.githubusercontent.com/bazelboost/registry/main common --registry=https://bcr.bazel.build build --enable_platform_specific_config -build --incompatible_use_platforms_repo_for_constraints build --incompatible_enable_cc_toolchain_resolution build --incompatible_strict_action_env build --enable_runfiles diff --git a/bazel/copts.bzl b/bazel/copts.bzl index 891e653..b8ebf62 100644 --- a/bazel/copts.bzl +++ b/bazel/copts.bzl @@ -1,6 +1,6 @@ load("@bazel_skylib//lib:selects.bzl", "selects") -# Ecsact repositories currently only support clang and cl +# Ecsact repositories currently only support clang, cl, and emscripten copts = selects.with_or({ (Label("//bazel:compiler_emscripten")): [ "-std=c++20",