refactor: upgrade Bazel and use bazel_env

.bazelversion

@@ -1 +1 @@
-6.5.0
+8.4.0

.envrc

@@ -0,0 +1,5 @@
+watch_file bazel-out/bazel_env-opt/bin/bin/bazel_env/bin
+PATH_add bazel-out/bazel_env-opt/bin/bin/bazel_env/bin
+if [[ ! -d bazel-out/bazel_env-opt/bin/bin/bazel_env/bin ]]; then
+  log_error "ERROR[bazel_env.bzl]: Run 'bazel run //bin:bazel_env' to regenerate bazel-out/bazel_env-opt/bin/bin/bazel_env/bin"
+fi

.github/workflows/deploy.yml

@@ -29,10 +29,17 @@ jobs:
         with:
           version: 8.6.12
 
+      - name: Install direnv
+        run: |
+          sudo apt-get install -y direnv
+          eval "$(direnv hook bash)"
       - name: Install required binaries
         run: |
-          ./install_bins.sh
-
+          direnv allow .
+          eval "$(direnv export bash)"
+          # GHA steps run as non-interactive shells so they don't source the .bashrc
+          echo "PATH=$PATH" >> $GITHUB_ENV
+          bazel run //bin:bazel_env
       - name: Checkout BCR submodule
         run: |
           git submodule update --init -- data/bazel-central-registry

.github/workflows/test.yml

@@ -21,11 +21,17 @@ jobs:
           version: 8.6.12
       - name: Install node_modules
         run: pnpm install --frozen-lockfile
-
+      - name: Install direnv
+        run: |
+          sudo apt-get install -y direnv
+          eval "$(direnv hook bash)"
       - name: Install required binaries
         run: |
-          ./install_bins.sh
-
+          direnv allow .
+          eval "$(direnv export bash)"
+          # GHA steps run as non-interactive shells so they don't source the .bashrc
+          echo "PATH=$PATH" >> $GITHUB_ENV
+          bazel run //bin:bazel_env
       - name: Check prettier formatting
         run: pnpm prettier-check
 

MODULE.bazel

@@ -0,0 +1,3 @@
+bazel_dep(name = "bazel_env.bzl", version = "0.5.0")
+bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
+bazel_dep(name = "buildozer", version = "7.1.2")

README.md

@@ -22,10 +22,10 @@ We use git submodules to include the data from bazelbuild/bazel-central-registry
 git submodule update --init
 ```
 
-To get a buildozer binary, you also need to run this before launching the app:
+To get a buildifier and buildozer on your PATH, you also need to run this before launching the app:
 
 ```bash
-./install_bins.sh
+bazel run //bin:bazel_env
 ```
 
 Packages are managed via [pnpm](https://pnpm.io/), so they can be installed via `npx pnpm install`

bin/BUILD

@@ -0,0 +1,11 @@
+load("@bazel_env.bzl", "bazel_env")
+load("@buildozer//:buildozer.bzl", "BUILDOZER_LABEL")
+
+# Setup PATH via direnv
+bazel_env(
+    name = "bazel_env",
+    tools = {
+        "buildifier": "@buildifier_prebuilt//:buildifier",
+        "buildozer": BUILDOZER_LABEL,
+    },
+)

data/utils.ts

@@ -14,8 +14,6 @@ export const MODULES_ROOT_DIR = path.join(
   'modules'
 )
 
-export const BUILDOZER_BIN = path.join(process.cwd(), 'bin', 'buildozer')
-
 export interface Metadata {
   homepage?: string
   maintainers?: Array<{
@@ -176,24 +174,24 @@ export const extractModuleInfo = async (
   await fs.cp(moduleFilePath, path.join(directory, 'BUILD.bazel'))
 
   const { stdout: compatibilityLevelOut } = await execa(
-    BUILDOZER_BIN,
+    'buildozer',
     ['print compatibility_level', ':%module'],
     { cwd: directory }
   )
   const compatibilityLevel = parseInt(compatibilityLevelOut, 10) || 0
 
   const { stdout: listDepNamesOut } = await execa(
-    BUILDOZER_BIN,
+    'buildozer',
     ['print name', ':%bazel_dep'],
     { cwd: directory }
   )
   const { stdout: listDepVersionsOut } = await execa(
-    BUILDOZER_BIN,
+    'buildozer',
     ['print version', ':%bazel_dep'],
     { cwd: directory }
   )
   const { stdout: listDepDevOut } = await execa(
-    BUILDOZER_BIN,
+    'buildozer',
     ['print dev_dependency', ':%bazel_dep'],
     { cwd: directory }
   )