Skip to content

Commit eee32e8

Browse files
committed
fix: Move CI configuration to ci .bazelrc, fix issues
1 parent 11ca384 commit eee32e8

7 files changed

Lines changed: 3366 additions & 87 deletions

File tree

.bazelrc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717

1818
common --noenable_bzlmod
1919

20-
# Used on CI to test against bzlmod
21-
common:workspace --noenable_bzlmod
22-
common:bzlmod --enable_bzlmod
23-
2420
build --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
2521
build --incompatible_strict_action_env=true
2622
build --incompatible_enable_cc_toolchain_resolution
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ if [ "${BUILDBUDDY_API_KEY:-}" ]; then
99
echo "build --remote_cache=grpcs://remote.buildbuddy.io"
1010
echo "build --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY" > "$HOME/.bazelrc"
1111
fi
12+
13+
# Configure flags for bzlmod
14+
echo "common:bzlmod --enable_bzlmod" >> "$HOME/.bazelrc"
15+
echo "common:workspace --noenable_bzlmod" >> "$HOME/.bazelrc"

.github/workflows/default.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
repository-cache: true
3838
- name: Test
3939
run: |
40-
./.github/workflows/configurebb.sh
40+
./.github/workflows/configure_bazelrc.sh
4141
bazel test --config ci --config ${{ matrix.bzlmod_config }} //...
4242
env:
4343
BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
@@ -63,7 +63,7 @@ jobs:
6363
repository-cache: true
6464
- name: Test
6565
run: |
66-
./.github/workflows/configurebb.sh
66+
./.github/workflows/configure_bazelrc.sh
6767
bazel test --config ci --config ${{ matrix.bzlmod_config }} --compilation_mode ${{ matrix.compilation_mode }} //...
6868
env:
6969
BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
@@ -90,7 +90,7 @@ jobs:
9090
repository-cache: true
9191
- name: Test ${{ matrix.sanitizer }}
9292
run: |
93-
./.github/workflows/configurebb.sh
93+
./.github/workflows/configure_bazelrc.sh
9494
bazel test --config ci --config ${{ matrix.sanitizer }} --config ${{ matrix.bzlmod_config }} //tests/sanitizers:${{ matrix.sanitizer }}_test
9595
env:
9696
BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
@@ -107,7 +107,7 @@ jobs:
107107
repository-cache: true
108108
- name: Test Coverage
109109
run: |
110-
./.github/workflows/configurebb.sh
110+
./.github/workflows/configure_bazelrc.sh
111111
bazel coverage --config ci //examples/hello_world_cpp:hello_world_cpp_test
112112
env:
113113
BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
@@ -132,7 +132,7 @@ jobs:
132132
repository-cache: true
133133
- name: Test with RBE
134134
run: |
135-
./.github/workflows/configurebb.sh
135+
./.github/workflows/configure_bazelrc.sh
136136
bazel test --config ci --config rbe --config ${{ matrix.bzlmod_config }} //...
137137
env:
138138
BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}

MODULE.bazel

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module(name = "gcc_toolchain")
33
# Dependencies
44
# ============
55
bazel_dep(name = "bazel_skylib", version = "1.8.1")
6-
bazel_dep(name = "aspect_bazel_lib", version = "2.20.0")
6+
bazel_dep(name = "aspect_bazel_lib", version = "1.40.2")
77
bazel_dep(name = "platforms", version = "1.0.0")
88
bazel_dep(name = "rules_cc", version = "0.2.0")
99

@@ -38,6 +38,11 @@ gcc_toolchains = use_extension("//toolchain:module_extensions.bzl", "gcc_toolcha
3838
# ===============================
3939
bazel_dep(name = "rules_proto", version = "7.1.0", dev_dependency = True)
4040
bazel_dep(name = "rules_foreign_cc", version = "0.15.0", dev_dependency = True)
41+
bazel_dep(name = "stardoc", version = "0.5.6", dev_dependency = True, repo_name = "io_bazel_stardoc")
42+
single_version_override(
43+
module_name = "stardoc",
44+
version = "0.5.6",
45+
)
4146
bazel_dep(name = "protobuf", version = "29.3", dev_dependency = True, repo_name = "com_google_protobuf")
4247
single_version_override(
4348
module_name = "protobuf",

0 commit comments

Comments
 (0)