Skip to content

Commit

Permalink
[build] Update arm builds to bookworm (#7501)
Browse files Browse the repository at this point in the history
Also bumps native-utils to 2025.9.0.
And upgrades OpenCV to -3; fixes some enum conversion deprecation warnings.
  • Loading branch information
PeterJohnson authored Dec 7, 2024
1 parent c3fc7c8 commit 1921d01
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
- container: wpilib/roborio-cross-ubuntu:2025-22.04
artifact-name: Athena
build-options: "-Ponlylinuxathena"
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
- container: wpilib/raspbian-cross-ubuntu:bookworm-22.04
artifact-name: Arm32
build-options: "-Ponlylinuxarm32"
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04
- container: wpilib/aarch64-cross-ubuntu:bookworm-22.04
artifact-name: Arm64
build-options: "-Ponlylinuxarm64"
- container: wpilib/ubuntu-base:22.04
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sentinel-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- container: wpilib/roborio-cross-ubuntu:2025-22.04
artifact-name: Athena
build-options: "-Ponlylinuxathena"
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
- container: wpilib/raspbian-cross-ubuntu:bookworm-22.04
artifact-name: Arm32
build-options: "-Ponlylinuxarm32"
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04
- container: wpilib/aarch64-cross-ubuntu:bookworm-22.04
artifact-name: Arm64
build-options: "-Ponlylinuxarm64"
- container: wpilib/ubuntu-base:22.04
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ repositories {
}
}
dependencies {
implementation "edu.wpi.first:native-utils:2025.7.1"
implementation "edu.wpi.first:native-utils:2025.9.0"
}
2 changes: 1 addition & 1 deletion shared/config.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ nativeUtils {
configureDependencies {
opencvYear = "frc2025"
niLibVersion = "2025.0.0"
opencvVersion = "4.10.0-2"
opencvVersion = "4.10.0-3"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion shared/opencv.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
def opencvVersion = '4.10.0-2'
def opencvVersion = '4.10.0-3'

if (project.hasProperty('useCpp') && project.useCpp) {
model {
Expand Down

0 comments on commit 1921d01

Please sign in to comment.