Skip to content

Commit 37ba14f

Browse files
authored
Merge pull request #1264 from alextac98/dev/fsw-github-merge
Refactor bazel rules to make the build more hermetic
2 parents 967fe9f + a2a4d06 commit 37ba14f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1764
-800
lines changed

.bazelrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
common --enable_bzlmod
12
build --enable_platform_specific_config
23
build:linux --cxxopt="-std=c++14"
34
build:windows --cxxopt="/std:c++17"

.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8.5.1

.github/workflows/build-test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ jobs:
380380
matrix:
381381
os: [ubuntu-24.04]
382382
toolchain: [stable]
383-
bazel-mode: ["--enable_bzlmod", "--noenable_bzlmod"]
383+
bazel-version: ["7.4.1", "8.5.1"]
384384
timeout-minutes: 60
385385
runs-on: ${{ matrix.os }}
386386
steps:
@@ -402,13 +402,13 @@ jobs:
402402

403403
- name: Run bazel build
404404
env:
405-
USE_BAZEL_VERSION: "7.4.1"
406-
run: bazel build //... ${{ matrix.bazel-mode }}
405+
USE_BAZEL_VERSION: ${{matrix.bazel-version}}
406+
run: bazel build //...
407407

408408
- name: Run bazel test
409409
env:
410-
USE_BAZEL_VERSION: "7.4.1"
411-
run: bazel test //... ${{ matrix.bazel-mode }}
410+
USE_BAZEL_VERSION: ${{matrix.bazel-version}}
411+
run: bazel test //...
412412

413413
cxx-vocabulary-types:
414414
needs: [preflight-check, static-code-analysis]

0 commit comments

Comments
 (0)