diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a99624f..0b9203c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,6 +28,7 @@ jobs: if: >- (github.event_name == 'pull_request' && (github.event.pull_request.user.login == 'renovate[bot]' || github.event.pull_request.user.login == 'seaubot')) || (github.event_name == 'merge_group' && github.event.pull_request.user.login != 'renovate[bot]' && github.event.pull_request.user.login != 'seaubot') + || contains(github.event.pull_request.labels.*.name, 'ci:always') runs-on: windows-latest steps: - uses: actions/cache@v4 @@ -46,6 +47,7 @@ jobs: if: >- (github.event_name == 'pull_request' && (github.event.pull_request.user.login == 'renovate[bot]' || github.event.pull_request.user.login == 'seaubot')) || (github.event_name == 'merge_group' && github.event.pull_request.user.login != 'renovate[bot]' && github.event.pull_request.user.login != 'seaubot') + || contains(github.event.pull_request.labels.*.name, 'ci:always') runs-on: ubuntu-latest steps: - uses: actions/cache@v4 diff --git a/MODULE.bazel b/MODULE.bazel index 62d2b13..9d1e462 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep(name = "boost.process", version = "1.83.0.bzl.2") bazel_dep(name = "boost.algorithm", version = "1.83.0.bzl.1") bazel_dep(name = "boost.url", version = "1.83.0.bzl.2") bazel_dep(name = "yaml-cpp", version = "0.8.0") -bazel_dep(name = "libarchive", version = "3.7.4.bcr.2") +bazel_dep(name = "libarchive", version = "3.7.5.bcr.1") bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True) bazel_dep(name = "toolchains_llvm", version = "1.0.0", dev_dependency = True) diff --git a/bazel/common.bazelrc b/bazel/common.bazelrc index 9c8eb86..e4d564b 100644 --- a/bazel/common.bazelrc +++ b/bazel/common.bazelrc @@ -1,6 +1,7 @@ startup --windows_enable_symlinks common --enable_bzlmod common --registry=https://raw.githubusercontent.com/ecsact-dev/bazel_registry/main +common --registry=https://raw.githubusercontent.com/thesayyn/bazel-central-registry/5593000c81d6e1ee7505e5422fa7682f3fae0830 # temp common --registry=https://raw.githubusercontent.com/zaucy/bazel-central-registry/add-curl-config2 # temporary common --registry=https://raw.githubusercontent.com/bazelboost/registry/main common --registry=https://bcr.bazel.build diff --git a/test/MODULE.bazel b/test/MODULE.bazel index 8b3c5c7..83eaa0c 100644 --- a/test/MODULE.bazel +++ b/test/MODULE.bazel @@ -5,13 +5,6 @@ bazel_dep(name = "boost.dll", version = "1.83.0.bzl.2") bazel_dep(name = "boost.process", version = "1.83.0.bzl.2") bazel_dep(name = "ecsact_runtime", version = "0.6.5") -# TODO: https://github.com/bazelbuild/bazel-central-registry/pull/1916 -git_override( - module_name = "libarchive", - commit = "7c331f92acea5243c195cdc6fb46ecfa11ce1ce2", - remote = "https://github.com/zaucy/libarchive.git", -) - bazel_dep(name = "toolchains_llvm", version = "1.0.0", dev_dependency = True) bazel_dep(name = "hedron_compile_commands", dev_dependency = True)