Fix bookworm compiler

wpilibsuite · Dec 7, 2024 · 4f147d1 · 4f147d1
1 parent 8102986
commit 4f147d1
Show file tree

Hide file tree

Showing 3 changed files with 156 additions and 114 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -157,6 +157,41 @@ jobs:
       run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci
       working-directory: tests
 
+  build_bookworm32:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        # Build non-bzlmod, bookworm32
+        - { name: "windows - bookworm32",         os: windows-2022, java_arch: "x64",     command: "build", config: "--noenable_bzlmod --config=bookworm32", bazel_options: "--output_user_root=C:\\bazelroot", }
+        - { name: "ubuntu  - bookworm32",         os: ubuntu-22.04, java_arch: "x64",     command: "build", config: "--noenable_bzlmod --config=bookworm32", bazel_options: "",                                 }
+        - { name: "macos   - bookworm32",         os: macos-14,     java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bookworm32", bazel_options: "",                                 }
+
+        # Build bzlmod, bookworm32
+        - { name: "windows - bzlmod bookworm32",  os: windows-2022, java_arch: "x64",     command: "build", config: "--enable_bzlmod --config=bookworm32", bazel_options: "--output_user_root=C:\\bazelroot", }
+        - { name: "ubuntu  - bzlmod bookworm32",  os: ubuntu-22.04, java_arch: "x64",     command: "build", config: "--enable_bzlmod --config=bookworm32", bazel_options: "",                                 }
+        - { name: "macos   - bzlmod bookworm32",  os: macos-14,     java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=bookworm32", bazel_options: "",                                 }
+    name: "Build - ${{ matrix.name }}"
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      with: { python-version: '3.11' }
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'zulu'
+        java-version: 17
+        architecture: ${{ matrix.java_arch }}
+    - id: setup_build_buddy
+      uses: ./.github/actions/setup-build-buddy
+      with:
+        token: ${{ secrets.BUILDBUDDY_API_KEY }}
+    - name: Build and allow failure # TODO Sometimes symlinks don't get created correctly the first time around
+      run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci || true
+      working-directory: tests
+    - name: Build
+      run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci
+      working-directory: tests
 
   build_bookworm64:
     strategy:

diff --git a/private/non_bzlmod_dependencies/setup_dependencies.bzl b/private/non_bzlmod_dependencies/setup_dependencies.bzl
@@ -23,6 +23,12 @@ def _setup_toolchains():
         "@local_bullseye_64//:macos",
         "@local_bullseye_64//:linux",
         "@local_bullseye_64//:windows",
+        "@local_bookworm_32//:macos",
+        "@local_bookworm_32//:linux",
+        "@local_bookworm_32//:windows",
+        "@local_bookworm_64//:macos",
+        "@local_bookworm_64//:linux",
+        "@local_bookworm_64//:windows",
     )
 
 def _setup_cpp_dependencies():