[drake_bazel_...] Cleanups for bazel version

.github/workflows/bazel_download.yml

@@ -16,6 +16,9 @@ jobs:
       - name: setup
         run: ./drake_bazel_download/.github/ubuntu_setup
         shell: bash
+      - name: install_bazelisk
+        run: ./drake_bazel_download/setup/install_bazelisk
+        shell: bash
       - name: bazel_download build and test
         run: ./drake_bazel_download/.github/ci_build_test
         shell: bash

drake_bazel_download/.bazeliskrc

@@ -1,3 +1 @@
-# Keep this version number in sync with the Ubuntu deb installed by
-# drake/setup/ubuntu/source_distribution/install_bazel.sh.
-USE_BAZEL_VERSION=7.0.2
+USE_BAZEL_VERSION=7.4.1

drake_bazel_download/MODULE.bazel

@@ -3,8 +3,8 @@
 module(name = "drake_external_examples")
 
 # Add the Bazel rulesets we need.
-bazel_dep(name = "rules_cc", version = "0.0.9")
-bazel_dep(name = "rules_python", version = "0.31.0")
+bazel_dep(name = "rules_cc", version = "0.0.16")
+bazel_dep(name = "rules_python", version = "0.39.0")
 
 # Use the host system python.
 register_toolchains("@bazel_tools//tools/python:autodetecting_toolchain")

drake_bazel_download/README.md

@@ -14,6 +14,11 @@ First, install the required Ubuntu packages:
 sudo setup/install_prereqs
 ```
 
+If you don't have already bazel or bazelisk already installed, install bazelisk:
+```
+sudo setup/install_bazelisk
+```
+
 Then, to build and test all apps:
 ```
 bazel test //...

drake_bazel_download/setup/install_bazelisk

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# TODO(jwnimmer-tri) Drake's install_prereqs script should perform this
+# install step for us, but it doesn't so we need this work-around in the
+# meantime.
+
+set -euxo pipefail
+
+if [[ "${EUID:-}" -ne 0 ]]; then
+  echo 'This script must be run as root' >&2
+  exit 2
+fi
+
+wget -O bazelisk.deb \
+  https://github.com/bazelbuild/bazelisk/releases/download/v1.23.0/bazelisk-amd64.deb
+dpkg -i bazelisk.deb

drake_bazel_download/setup/install_prereqs

@@ -59,15 +59,3 @@ tar -xf drake.tar.gz -C /opt
 echo -e "\ndrake VERSION.TXT: $(cat /opt/drake/share/doc/drake/VERSION.TXT)\n"
 
 /opt/drake/share/drake/setup/install_prereqs
-
-apt-get install --no-install-recommends gnupg
-
-apt-key adv --fetch-keys https://bazel.build/bazel-release.pub.gpg
-echo 'deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8' \
-  > /etc/apt/sources.list.d/bazel.list
-
-apt-get update
-apt-get install --no-install-recommends $(cat <<EOF
-  bazel
-EOF
-)

drake_bazel_external/.bazeliskrc

@@ -0,0 +1 @@
+USE_BAZEL_VERSION=7.4.1

drake_bazel_external/.bazelrc

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: MIT-0
 
+# Don't use bzlmod yet.
+common --enable_workspace=true
+common --enable_bzlmod=false
+
 # Default to an optimized build.
 build --compilation_mode=opt
 

drake_bazel_external/.github/setup

@@ -5,6 +5,7 @@ set -euxo pipefail
 
 cd $(dirname "${BASH_SOURCE}")
 sudo ./ubuntu_setup
+sudo ../setup/install_bazelisk
 
 cat > "${HOME}/.bazelrc" << EOF
 startup --output_user_root=${WORKSPACE}/_bazel_${USER}

drake_bazel_external/README.md

@@ -13,6 +13,11 @@ First, install the required Ubuntu packages:
 sudo setup/install_prereqs
 ```
 
+If you don't have already bazel or bazelisk already installed, install bazelisk:
+```
+sudo setup/install_bazelisk
+```
+
 Then, to build and test all apps:
 ```
 bazel test //...

drake_bazel_external/setup/install_bazelisk

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# TODO(jwnimmer-tri) Drake's install_prereqs script should perform this
+# install step for us, but it doesn't so we need this work-around in the
+# meantime.
+
+set -euxo pipefail
+
+if [[ "${EUID:-}" -ne 0 ]]; then
+  echo 'This script must be run as root' >&2
+  exit 2
+fi
+
+wget -O bazelisk.deb \
+  https://github.com/bazelbuild/bazelisk/releases/download/v1.23.0/bazelisk-amd64.deb
+dpkg -i bazelisk.deb

drake_bazel_external/setup/install_prereqs

@@ -74,15 +74,8 @@ echo -e "\ndrake VERSION.TXT: $(cat /opt/drake/share/doc/drake/VERSION.TXT)\n"
 
 /opt/drake/share/drake/setup/install_prereqs
 
-apt-get install --no-install-recommends gnupg
-
-apt-key adv --fetch-keys https://bazel.build/bazel-release.pub.gpg
-echo 'deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8' \
-  > /etc/apt/sources.list.d/bazel.list
-
 apt-get update
 apt-get install --no-install-recommends $(cat <<EOF
-  bazel
   cmake
   default-jdk
   file

drake_cmake_external/setup/install_prereqs

@@ -74,15 +74,8 @@ echo -e "\ndrake VERSION.TXT: $(cat /opt/drake/share/doc/drake/VERSION.TXT)\n"
 
 /opt/drake/share/drake/setup/install_prereqs
 
-apt-get install --no-install-recommends gnupg
-
-apt-key adv --fetch-keys https://bazel.build/bazel-release.pub.gpg
-echo 'deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8' \
-  > /etc/apt/sources.list.d/bazel.list
-
 apt-get update
 apt-get install --no-install-recommends $(cat <<EOF
-  bazel
   cmake
   default-jdk
   file

private/test/file_sync_test.py

@@ -46,14 +46,18 @@
         "drake_cmake_installed/LICENSE",
         "drake_cmake_installed_apt/LICENSE",
     ),
-    (
-        "drake_bazel_external/.github/setup",
-        "drake_cmake_external/.github/setup",
-    ),
     (
         "drake_bazel_external/setup/install_prereqs",
         "drake_cmake_external/setup/install_prereqs",
     ),
+    (
+        "drake_bazel_download/.bazeliskrc",
+        "drake_bazel_external/.bazeliskrc",
+    ),
+    (
+        "drake_bazel_download/setup/install_bazelisk",
+        "drake_bazel_external/setup/install_bazelisk",
+    ),
 )
 
 found_errors = False