From 0213ecf382bf39096934b07ab0e1740b3dc308de Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Mon, 8 Jun 2026 19:21:33 -0700
Subject: [PATCH] [build] Update native utils, to switch to new compilers
 (#8966)

---
 .github/workflows/cmake.yml          | 2 +-
 .github/workflows/gradle.yml         | 6 +++---
 .github/workflows/lint-format.yml    | 4 ++--
 .github/workflows/sanitizers.yml     | 2 +-
 .github/workflows/sentinel-build.yml | 6 +++---
 gradle/libs.versions.toml            | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index a7608dd04c..17978994df 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -18,7 +18,7 @@ jobs:
         include:
           - os: ubuntu-24.04
             name: Linux
-            container: wpilib/systemcore-cross-ubuntu:2027-24.04
+            container: wpilib/systemcore-cross-debian:trixie
             flags: "--preset with-sccache -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON"
           - os: macOS-15
             name: macOS
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 6662f33359..7b6d5ebe88 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -19,13 +19,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - container: wpilib/systemcore-cross-ubuntu:2027-24.04
+          - container: wpilib/systemcore-cross-debian:trixie
             artifact-name: Systemcore
             build-options: "-Ponlylinuxsystemcore"
-          - container: wpilib/aarch64-cross-ubuntu:2027-bookworm-24.04
+          - container: wpilib/aarch64-cross-debian:trixie
             artifact-name: Arm64
             build-options: "-Ponlylinuxarm64"
-          - container: wpilib/systemcore-cross-ubuntu:2027-24.04
+          - container: wpilib/systemcore-cross-debian:trixie
             artifact-name: Linux
             build-options: "-Ponlylinuxx86-64"
     name: "Build - ${{ matrix.artifact-name }}"
diff --git a/.github/workflows/lint-format.yml b/.github/workflows/lint-format.yml
index 376ee14ea4..c344b09d4c 100644
--- a/.github/workflows/lint-format.yml
+++ b/.github/workflows/lint-format.yml
@@ -61,7 +61,7 @@ jobs:
     name: "clang-tidy"
     runs-on: ubuntu-24.04
     needs: [validation]
-    container: wpilib/ubuntu-base:24.04
+    container: wpilib/debian-base:trixie
     steps:
       - uses: actions/checkout@v6
         with:
@@ -94,7 +94,7 @@ jobs:
     name: "Java format"
     runs-on: ubuntu-24.04
     needs: [validation]
-    container: wpilib/systemcore-cross-ubuntu:2027-24.04
+    container: wpilib/debian-base:trixie
     steps:
       - uses: actions/checkout@v6
         with:
diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml
index 6942937ef4..55e8334117 100644
--- a/.github/workflows/sanitizers.yml
+++ b/.github/workflows/sanitizers.yml
@@ -30,7 +30,7 @@ jobs:
             ctest-flags: ""
     name: "${{ matrix.name }}"
     runs-on: ubuntu-24.04
-    container: wpilib/roborio-cross-ubuntu:2025-24.04
+    container: wpilib/debian-base:trixie
     steps:
       - name: Install Dependencies
         run: sudo apt-get update && sudo apt-get install -y libopencv-dev clang-18 ninja-build avahi-daemon
diff --git a/.github/workflows/sentinel-build.yml b/.github/workflows/sentinel-build.yml
index 3059bdba75..e95908573a 100644
--- a/.github/workflows/sentinel-build.yml
+++ b/.github/workflows/sentinel-build.yml
@@ -23,13 +23,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - container: wpilib/systemcore-cross-ubuntu:2027-24.04
+          - container: wpilib/systemcore-cross-debian:trixie
             artifact-name: Systemcore
             build-options: "-Ponlylinuxsystemcore"
-          - container: wpilib/aarch64-cross-ubuntu:2027-bookworm-24.04
+          - container: wpilib/aarch64-cross-debian:trixie
             artifact-name: Arm64
             build-options: "-Ponlylinuxarm64"
-          - container: wpilib/systemcore-cross-ubuntu:2027-24.04
+          - container: wpilib/systemcore-cross-debian:trixie
             artifact-name: Linux
             build-options: "-Ponlylinuxx86-64"
     name: "Build - ${{ matrix.artifact-name }}"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a215450fa4..dff37064f5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ mockito-core = { module = "org.mockito:mockito-core", version = "4.1.0" }
 # Note that these are also Gradle plugins and cannot be used with the plugin specification
 # due to their presence on the classpath without version information.
 wpilib-gradle-vscode = { module = "org.wpilib:gradle-cpp-vscode", version = "2027.0.0" }
-wpilib-native-utils = { module = "org.wpilib:native-utils", version = "2027.7.1" }
+wpilib-native-utils = { module = "org.wpilib:native-utils", version = "2027.8.2" }
 
 [bundles]
 ejml = ["ejml-simple"]
@@ -45,6 +45,6 @@ wpilib-gradle-jni = { id = "org.wpilib.GradleJni", version = "2027.0.0" }
 # Note: these plugins can't be used. Their JARs are on the classpath for buildSrc,
 # which doesn't retain version information.
 # wpilib-gradle-vscode = { id = "org.wpilib.GradleVsCode", version = "2027.0.0" }
-# wpilib-native-utils = { id = "org.wpilib.NativeUtils", version = "2027.7.1" }
+# wpilib-native-utils = { id = "org.wpilib.NativeUtils", version = "2027.8.2" }
 wpilib-repositories = { id = "org.wpilib.WPILibRepositoriesPlugin", version = "2027.0.0" }
 wpilib-versioning = { id = "org.wpilib.WPILibVersioningPlugin", version = "2027.0.1" }