From 61a17c0f1bb5970e1cea11797c9cdee73db1c890 Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Wed, 20 Nov 2024 08:53:41 -0800 Subject: [PATCH 1/4] chore: testing libarchive changes --- MODULE.bazel | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MODULE.bazel b/MODULE.bazel index 62d2b13..cbcb5c5 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -22,6 +22,12 @@ 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") +git_override( + module_name = "libarchive", + commit = "5593000c81d6e1ee7505e5422fa7682f3fae0830", + remote = "https://github.com/thesayyn/bazel-central-registry.git", +) + bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True) bazel_dep(name = "toolchains_llvm", version = "1.0.0", dev_dependency = True) bazel_dep(name = "hedron_compile_commands", dev_dependency = True) From 31f48bff45b57bef8467a6dbff1e65d41ae177e3 Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Wed, 20 Nov 2024 08:54:17 -0800 Subject: [PATCH 2/4] chore: testing libarchive changes --- test/MODULE.bazel | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/MODULE.bazel b/test/MODULE.bazel index 8b3c5c7..de544e7 100644 --- a/test/MODULE.bazel +++ b/test/MODULE.bazel @@ -5,11 +5,10 @@ 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", + commit = "5593000c81d6e1ee7505e5422fa7682f3fae0830", + remote = "https://github.com/thesayyn/bazel-central-registry.git", ) bazel_dep(name = "toolchains_llvm", version = "1.0.0", dev_dependency = True) From a528123caeea3a2b2f130c6c21694ed53d1a724f Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Wed, 20 Nov 2024 08:57:25 -0800 Subject: [PATCH 3/4] chore: testing libarchive changes --- MODULE.bazel | 8 +------- bazel/common.bazelrc | 1 + test/MODULE.bazel | 6 ------ 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index cbcb5c5..9d1e462 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -20,13 +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") - -git_override( - module_name = "libarchive", - commit = "5593000c81d6e1ee7505e5422fa7682f3fae0830", - remote = "https://github.com/thesayyn/bazel-central-registry.git", -) +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 de544e7..83eaa0c 100644 --- a/test/MODULE.bazel +++ b/test/MODULE.bazel @@ -5,12 +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") -git_override( - module_name = "libarchive", - commit = "5593000c81d6e1ee7505e5422fa7682f3fae0830", - remote = "https://github.com/thesayyn/bazel-central-registry.git", -) - bazel_dep(name = "toolchains_llvm", version = "1.0.0", dev_dependency = True) bazel_dep(name = "hedron_compile_commands", dev_dependency = True) From 8277d1c107828b92991a138dfe52579391e05f01 Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Wed, 20 Nov 2024 09:03:49 -0800 Subject: [PATCH 4/4] chore: add back ci always --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) 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