deps: Migrate everything to being modules

robinlinden · Dec 25, 2024 · cc5f08f · cc5f08f
1 parent 9a3f59f
commit cc5f08f
Show file tree

Hide file tree

Showing 8 changed files with 497 additions and 297 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1,8 +1,6 @@
 # Bazel configuration
 # =========================================================
 
-common --enable_workspace
-
 # We handle hermeticity by explicitly specifying dependencies instead of using
 # the lockfile system.
 common --lockfile_mode=off

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -73,7 +73,7 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache/bazel
-          key: ${{ matrix.name }}-${{ hashFiles('.bazelversion', 'WORKSPACE', 'third_party/**') }}
+          key: ${{ matrix.name }}-${{ hashFiles('.bazelversion', 'MODULE.bazel', 'third_party/**') }}
       - run: echo "build --config=buildbuddy-cache-upload --remote_header=x-buildbuddy-api-key=${BUILDBUDDY_API_KEY}" >.bazelrc.local
         env:
           BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
@@ -111,7 +111,7 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache/bazel
-          key: coverage-${{ matrix.compiler }}-${{ matrix.version }}-${{ hashFiles('.bazelversion', 'WORKSPACE', 'third_party/**') }}
+          key: coverage-${{ matrix.compiler }}-${{ matrix.version }}-${{ hashFiles('.bazelversion', 'MODULE.bazel', 'third_party/**') }}
       - name: Setup (gcc)
         if: startsWith(matrix.compiler, 'gcc')
         run: |
@@ -159,7 +159,7 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache/bazel
-          key: aarch64_linux_muslc-${{ hashFiles('.bazelversion', 'WORKSPACE', 'third_party/**') }}
+          key: aarch64_linux_muslc-${{ hashFiles('.bazelversion', 'MODULE.bazel', 'third_party/**') }}
       - run: sudo apt-get update && sudo apt-get install -y --no-install-recommends qemu-user-static binfmt-support
       - run: sudo update-binfmts --enable qemu-aarch64
       - run: echo "build --config=linux-aarch64-musl" >.bazelrc.local
@@ -226,7 +226,7 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache/bazel
-          key: windows_msvc-${{ hashFiles('.bazelversion', 'WORKSPACE', 'third_party/**') }}
+          key: windows_msvc-${{ hashFiles('.bazelversion', 'MODULE.bazel', 'third_party/**') }}
       - run: echo "build --disk_cache ~/.cache/bazel" >.bazelrc.local
       - run: echo "build --config=buildbuddy-cache-upload --remote_header=x-buildbuddy-api-key=${BUILDBUDDY_API_KEY}" >>.bazelrc.local
         env:
@@ -252,7 +252,7 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache/bazel
-          key: windows_clang_cl-${{ hashFiles('.bazelversion', 'WORKSPACE', 'third_party/**') }}
+          key: windows_clang_cl-${{ hashFiles('.bazelversion', 'MODULE.bazel', 'third_party/**') }}
       - run: echo "build --config clang-cl" >.bazelrc.local
       - run: echo "build --disk_cache ~/.cache/bazel" >>.bazelrc.local
       - run: echo "build --config=buildbuddy-cache-upload --remote_header=x-buildbuddy-api-key=${BUILDBUDDY_API_KEY}" >>.bazelrc.local
@@ -294,7 +294,7 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache/bazel
-          key: clang_tidy-${{ hashFiles('.bazelversion', 'WORKSPACE', 'third_party/**') }}
+          key: clang_tidy-${{ hashFiles('.bazelversion', 'MODULE.bazel', 'third_party/**') }}
       - name: Set up the llvm repository
         run: |
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -