Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(bazel): drop support for non-bazelmod builds #725

Merged
merged 2 commits into from
Nov 3, 2024
Merged

build(bazel): drop support for non-bazelmod builds #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52bc166
build(bazel): drop support for non-bazelmod builds
gjasny Nov 3, 2024
98e9fc5
build(bazel): update dependencies
gjasny Nov 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions .github/workflows/bazel-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,20 @@ jobs:
if: runner.os == 'macOS'
run: brew install telegraf

- name: Build with SSL (without bzlmod)
if: runner.os != 'macOS'
run: bazel build --noenable_bzlmod --config=ssl //...

- name: Build with SSL
if: runner.os != 'macOS'
run: bazel build --enable_bzlmod --config=ssl //...
run: bazel build --config=ssl //...

- name: Test with SSL
if: runner.os != 'macOS'
run: bazel test --enable_bzlmod --config=ssl --test_output=all //...
run: bazel test --config=ssl --test_output=all //...

- name: Build
run: bazel build --enable_bzlmod //...
run: bazel build //...

- name: Test
run: bazel test --enable_bzlmod --test_output=all //...
run: bazel test --test_output=all //...

- name: Scraping Test
if: runner.os != 'Windows'
run: bazel test --enable_bzlmod --test_output=all //pull/tests/integration:scrape-test
run: bazel test --test_output=all //pull/tests/integration:scrape-test
12 changes: 6 additions & 6 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ module(
repo_name = "com_github_jupp0r_prometheus_cpp",
)

bazel_dep(name = "boringssl", version = "0.0.0-20240530-2db0eb3")
bazel_dep(name = "boringssl", version = "0.20241024.0")
bazel_dep(name = "civetweb", version = "1.16")
bazel_dep(name = "curl", version = "8.7.1", repo_name = "com_github_curl")
bazel_dep(name = "curl", version = "8.8.0.bcr.1")
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "zlib", version = "1.3.1")
bazel_dep(name = "rules_cc", version = "0.0.13")
bazel_dep(name = "zlib", version = "1.3.1.bcr.3")

bazel_dep(name = "google_benchmark", version = "1.8.3", dev_dependency = True, repo_name = "com_github_google_benchmark")
bazel_dep(name = "googletest", version = "1.12.1", dev_dependency = True, repo_name = "com_google_googletest")
bazel_dep(name = "google_benchmark", version = "1.8.5", dev_dependency = True)
bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True)
3,966 changes: 3,737 additions & 229 deletions MODULE.bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions WORKSPACE
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion bazel/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
exports_files(
glob([
"*.BUILD",
"*.tpl",
]),
visibility = ["//visibility:public"],
Expand Down
105 changes: 0 additions & 105 deletions bazel/civetweb.BUILD
View file
Open in desktop

This file was deleted.

60 changes: 0 additions & 60 deletions bazel/curl.BUILD
View file
Open in desktop

This file was deleted.

Loading
Loading