Skip to content

Commit 56686fb

Browse files
authored
Merge pull request #747 from pgold/bazel_9
Build the project on Bazel 9.x.
2 parents f13cdd0 + b38d78a commit 56686fb

14 files changed

Lines changed: 31 additions & 8 deletions

File tree

.github/workflows/bazel-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ jobs:
5151

5252
- name: Scraping Test
5353
if: runner.os == 'macOS'
54-
run: bazel test ${{ matrix.bazel_args }} --test_output=all //pull/tests/integration:scrape-test
54+
run: bazel test ${{ matrix.bazel_args }} --test_output=all --test_env=TELEGRAF="$(brew --prefix telegraf)/bin/telegraf" //pull/tests/integration:scrape-test

MODULE.bazel

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ module(
55
)
66

77
bazel_dep(name = "boringssl", version = "0.20250311.0")
8-
bazel_dep(name = "civetweb", version = "1.16.bcr.1")
9-
bazel_dep(name = "curl", version = "8.8.0.bcr.3")
8+
bazel_dep(name = "civetweb", version = "1.16.bcr.4")
9+
bazel_dep(name = "curl", version = "8.12.0.bcr.1")
1010
bazel_dep(name = "platforms", version = "0.0.11")
1111
bazel_dep(name = "rules_cc", version = "0.1.1")
1212
bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
1313

14-
bazel_dep(name = "google_benchmark", version = "1.9.1", dev_dependency = True)
15-
bazel_dep(name = "googletest", version = "1.16.0", dev_dependency = True)
14+
bazel_dep(name = "google_benchmark", version = "1.9.5", dev_dependency = True)
15+
bazel_dep(name = "googletest", version = "1.17.0.bcr.2", dev_dependency = True)
16+
bazel_dep(name = "rules_shell", version = "0.8.0", dev_dependency = True)
1617

1718
# due to
1819
# https://github.com/bazelbuild/bazel/issues/24426

core/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
12
load("//bazel:export_header.bzl", "generate_dummy_export_header")
23

34
generate_dummy_export_header(

core/benchmarks/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
2+
13
cc_binary(
24
name = "benchmarks",
35
srcs = glob([

core/tests/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_cc//cc:cc_test.bzl", "cc_test")
2+
13
cc_test(
24
name = "unit",
35
srcs = glob([

pull/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
12
load("//bazel:export_header.bzl", "generate_dummy_export_header")
23

34
generate_dummy_export_header(

pull/tests/integration/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
2+
load("@rules_cc//cc:cc_test.bzl", "cc_test")
3+
load("@rules_shell//shell:sh_test.bzl", "sh_test")
4+
15
cc_binary(
26
name = "sample-server",
37
srcs = ["sample_server.cc"],

pull/tests/integration/scrape.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/env bash
22

3-
telegraf=$(which telegraf)
4-
if [ ! -x "$telegraf" ] ; then
3+
: "${TELEGRAF:=$(which telegraf)}"
4+
5+
if [ ! -x "$TELEGRAF" ] ; then
56
echo "telegraf must be in path for this test to run"
67
exit 1
78
fi
@@ -16,4 +17,4 @@ trap 'kill $(jobs -p)' EXIT
1617
timeout_after 10
1718

1819
pull/tests/integration/sample-server &
19-
telegraf --config pull/tests/integration/scrape.conf --quiet | grep -m1 http_requests_total
20+
"$TELEGRAF" --config pull/tests/integration/scrape.conf --quiet | grep -m1 http_requests_total

pull/tests/unit/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("@rules_cc//cc:cc_test.bzl", "cc_test")
2+
13
cc_test(
24
name = "unit",
35
srcs = glob(["*.cc"]),

push/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
12
load("//bazel:export_header.bzl", "generate_dummy_export_header")
23

34
generate_dummy_export_header(

0 commit comments

Comments
 (0)