Drop support for bazel5; switch to all bzlmod.

bazel5 is EOL in 2 months. bazel6 and beyond all support bzlmod, which means we can remove duplicate dependencies in WORKSPACE and MODULE.bazel.
hzeller · Dec 16, 2024 · 68dcbc2 · 68dcbc2
1 parent b0aaf2c
commit 68dcbc2
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 183 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1,3 +1,6 @@
+# bazel < 7 needs explicit enabling of bzlmod dependencies.
+build --enable_bzlmod
+
 # Enable support for absl types like string_view in gtest.
 build --define="absl=1"
 
@@ -26,6 +29,11 @@ common:macos --features=-supports_dynamic_linker --linkopt=-framework --linkopt=
 # Since we use designated initializers (C99 ... but >= c++20), compiler really wants the c++20 mode
 common:windows --compiler=clang-cl --cxxopt=/std:c++20 --host_cxxopt=/std:c++20 --client_env=BAZEL_CXXOPTS=/std:c++20
 
+# For 3rd party code: Disable warnings entirely.
+# They are not actionable and just create noise.
+build --per_file_copt=external/.*@-w
+build --host_per_file_copt=external/.*@-w
+
 # Address sanitizer settings.
 build:asan --strip=never
 build:asan --copt -fsanitize=address

diff --git a/.github/bin/run-clang-format.sh b/.github/bin/run-clang-format.sh
@@ -32,7 +32,7 @@ find . -name "*.h" -o -name "*.cc" \
 # If we have buildifier installed, use that on BUILD files
 if command -v ${BUILDIFIER} >/dev/null; then
   echo "Run $(buildifier --version)"
-  ${BUILDIFIER} -lint=fix WORKSPACE MODULE.bazel $(find . -name BUILD -o -name "*.bzl")
+  ${BUILDIFIER} -lint=fix MODULE.bazel $(find . -name BUILD -o -name "*.bzl")
 fi
 
 # Check if we got any diff

diff --git a/.github/settings.sh b/.github/settings.sh
@@ -32,7 +32,7 @@ export BAZEL_CXXOPTS="-std=c++17"
 export BAZEL_OPTS="-c opt --noshow_progress"
 
 # Used to fetch the BAZEL version where needed.
-export BAZEL_VERSION=5.4.1
+export BAZEL_VERSION=6.5.0
 
 # Kythe version for extracting xRefs
 export KYTHE_VERSION=v0.0.52

diff --git a/.github/workflows/verible-ci.yml b/.github/workflows/verible-ci.yml
@@ -103,14 +103,13 @@ jobs:
         path: |
           /root/.cache/clang-tidy
           /root/.cache/bazel
-        key: clang-tidy-${{ steps.cache_timestamp.outputs.time }}
-        restore-keys: clang-tidy-
+        key: clang-tidy1-${{ steps.cache_timestamp.outputs.time }}
+        restore-keys: clang-tidy1-
 
     - name: Build Project genrules
       run: |
         # Fetch all dependencies and run genrules for bant to see every file
-        # that makes it into the compile to build comile DB.f
-        bazel fetch ...
+        # that makes it into the compile to build comile DB.
         bazel build \
             //verible/common/analysis:command-file-lexer \
             //verible/verilog/parser:verilog-lex \
@@ -164,7 +163,6 @@ jobs:
         run: |
           # Fetch all dependencies and run genrules for bant to see every file
           # that makes it into the compile. Use bant itself to find genrules.
-          bazel fetch ...
           bazel build $(bin/bant -q genrule-outputs | awk '{print $2}') \
               //verible/common/analysis:command-file-lexer \
               //verible/verilog/parser:verilog-lex \
@@ -195,7 +193,6 @@ jobs:
         - compile-clang
         - compile-static
         - compile-static-clang
-        - coverage
         - clean
         arch:
         - x86_64
@@ -211,8 +208,6 @@ jobs:
             arch: arm64
           - mode: asan-clang
             arch: arm64
-          - mode: coverage
-            arch: arm64
     env:
       MODE: ${{ matrix.mode }}
       ARCH: ${{ matrix.arch }}
@@ -238,8 +233,8 @@ jobs:
       if: matrix.mode != 'clean' && matrix.mode != 'coverage'
       with:
         path: "/root/.cache/bazel"
-        key: bazelcache3_${{ matrix.arch }}_${{ matrix.mode }}_${{ steps.cache_timestamp.outputs.time }}
-        restore-keys: bazelcache3_${{ matrix.arch }}_${{ matrix.mode }}_
+        key: bazelcache_${{ matrix.arch }}_${{ matrix.mode }}_${{ steps.cache_timestamp.outputs.time }}
+        restore-keys: bazelcache_${{ matrix.arch }}_${{ matrix.mode }}_
 
     - name: Install Dependencies
       run: |
@@ -274,15 +269,6 @@ jobs:
     - name: ${{ matrix.mode }} Verible
       run: ./.github/bin/build-and-test.sh
 
-    - name: Upload coverage
-      # will show up under https://app.codecov.io/gh/chipsalliance/verible
-      if: matrix.mode == 'coverage'
-      uses: codecov/codecov-action@v2
-      with:
-        files: bazel-out/_coverage/_coverage_report.dat
-        verbose: true
-      continue-on-error: true
-
     - name: Gather and pack binaries
       if: matrix.mode == 'compile' && matrix.arch == 'x86_64'
       run: |
@@ -397,8 +383,8 @@ jobs:
       with:
         path: |
           /private/var/tmp/_bazel_runner
-        key: bazelcache_macos_${{ steps.cache_timestamp.outputs.time }}
-        restore-keys: bazelcache_macos_
+        key: bazelcache_macos1_${{ steps.cache_timestamp.outputs.time }}
+        restore-keys: bazelcache_macos1_
 
     - name: Tests
       # MacOS has a broken patch utility:
@@ -451,12 +437,12 @@ jobs:
       uses: actions/cache@v3
       with:
         path: "c:/users/runneradmin/_bazel_runneradmin"
-        key: bazelcache_windows_${{ steps.cache_timestamp.outputs.time }}
-        restore-keys: bazelcache_windows_
+        key: bazelcache_windows1_${{ steps.cache_timestamp.outputs.time }}
+        restore-keys: bazelcache_windows1_
 
     - name: Install dependencies
       run: |
-        choco install bazel --force --version=6.4.0
+        choco install bazel --force --version=6.5.0
         choco install winflexbison3
         choco install llvm --allow-downgrade --version=16.0.6
 

diff --git a/WORKSPACE b/WORKSPACE
diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod