From c387a7ecae5c95290bbf10b8d61d096bac796c35 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 30 Nov 2024 18:07:53 +0000 Subject: [PATCH] [build] Update to 2025 compilers (#7462) --- .github/workflows/cmake.yml | 2 +- .github/workflows/gradle.yml | 2 +- .github/workflows/lint-format.yml | 2 +- .github/workflows/sanitizers.yml | 2 +- .github/workflows/sentinel-build.yml | 2 +- .github/workflows/tools.yml | 2 +- buildSrc/build.gradle | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index e02060a15d..921a10bbdb 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -18,7 +18,7 @@ jobs: include: - os: ubuntu-22.04 name: Linux - container: wpilib/roborio-cross-ubuntu:2024-22.04 + container: wpilib/roborio-cross-ubuntu:2025-22.04 flags: "--preset with-java-and-sccache -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON" - os: macOS-14 name: macOS diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 727884d032..e6935cfba9 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: include: - - container: wpilib/roborio-cross-ubuntu:2024-22.04 + - container: wpilib/roborio-cross-ubuntu:2025-22.04 artifact-name: Athena build-options: "-Ponlylinuxathena" - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04 diff --git a/.github/workflows/lint-format.yml b/.github/workflows/lint-format.yml index 0a2dbc1a2b..008fe76560 100644 --- a/.github/workflows/lint-format.yml +++ b/.github/workflows/lint-format.yml @@ -51,7 +51,7 @@ jobs: tidy: name: "clang-tidy" runs-on: ubuntu-22.04 - container: wpilib/roborio-cross-ubuntu:2024-22.04 + container: wpilib/roborio-cross-ubuntu:2025-22.04 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml index c01e4c2042..c32a3a05b8 100644 --- a/.github/workflows/sanitizers.yml +++ b/.github/workflows/sanitizers.yml @@ -30,7 +30,7 @@ jobs: ctest-flags: "" name: "${{ matrix.name }}" runs-on: ubuntu-22.04 - container: wpilib/roborio-cross-ubuntu:2024-22.04 + container: wpilib/roborio-cross-ubuntu:2025-22.04 steps: - name: Install Dependencies run: sudo apt-get update && sudo apt-get install -y libopencv-dev libopencv4.5-java clang-14 libprotobuf-dev protobuf-compiler ninja-build diff --git a/.github/workflows/sentinel-build.yml b/.github/workflows/sentinel-build.yml index 38c66c410b..9a8eb85184 100644 --- a/.github/workflows/sentinel-build.yml +++ b/.github/workflows/sentinel-build.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: include: - - container: wpilib/roborio-cross-ubuntu:2024-22.04 + - container: wpilib/roborio-cross-ubuntu:2025-22.04 artifact-name: Athena build-options: "-Ponlylinuxathena" - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04 diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml index 3e71c5e830..899ac4239b 100644 --- a/.github/workflows/tools.yml +++ b/.github/workflows/tools.yml @@ -32,7 +32,7 @@ jobs: - name: Build WPILib with Gradle uses: addnab/docker-run-action@v3 with: - image: wpilib/roborio-cross-ubuntu:2024-22.04 + image: wpilib/roborio-cross-ubuntu:2025-22.04 options: -v ${{ github.workspace }}:/work -w /work -e GITHUB_REF -e CI -e DISPLAY run: df . && rm -f semicolon_delimited_script && ./gradlew :wpilibc:publish :wpilibj:publish :wpilibNewCommands:publish :hal:publish :cameraserver:publish :ntcore:publish :cscore:publish :wpimath:publish :wpinet:publish :wpiutil:publish :apriltag:publish :wpiunits:publish :simulation:halsim_gui:publish :simulation:halsim_ds_socket:publish :fieldImages:publish :epilogue-processor:publish :epilogue-runtime:publish :thirdparty:googletest:publish -x test -x Javadoc -x doxygen --build-cache && cp -r /root/releases/maven/development /work - uses: actions/upload-artifact@v4 diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 99d4892632..5c555c1c53 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -9,5 +9,5 @@ repositories { } } dependencies { - implementation "edu.wpi.first:native-utils:2025.3.0" + implementation "edu.wpi.first:native-utils:2025.7.1" }