diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed898eee42..b7271d6679 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -204,6 +204,9 @@ jobs: fail-fast: false matrix: include: + - container: wpilib/systemcore-cross-ubuntu:2025-24.04 + artifact-name: SystemCore + build-options: "-Ponlylinuxsystemcore" - container: wpilib/raspbian-cross-ubuntu:bookworm-24.04 artifact-name: Raspbian build-options: "-Ponlylinuxarm32" diff --git a/photon-lib/src/generate/photonlib.json.in b/photon-lib/src/generate/photonlib.json.in index 5df9ae5d2c..a1a62268ea 100644 --- a/photon-lib/src/generate/photonlib.json.in +++ b/photon-lib/src/generate/photonlib.json.in @@ -18,7 +18,7 @@ "isJar": false, "validPlatforms": [ "windowsx86-64", - "linuxathena", + "linuxsystemcore", "linuxx86-64", "osxuniversal" ] @@ -35,7 +35,7 @@ "skipInvalidPlatforms": true, "binaryPlatforms": [ "windowsx86-64", - "linuxathena", + "linuxsystemcore", "linuxx86-64", "osxuniversal" ] @@ -50,7 +50,7 @@ "skipInvalidPlatforms": true, "binaryPlatforms": [ "windowsx86-64", - "linuxathena", + "linuxsystemcore", "linuxx86-64", "osxuniversal" ] diff --git a/photon-targeting/build.gradle b/photon-targeting/build.gradle index e7a3df2740..56c804945a 100644 --- a/photon-targeting/build.gradle +++ b/photon-targeting/build.gradle @@ -78,7 +78,7 @@ model { enableCheckTask project.hasProperty('doJniCheck') javaCompileTasks << compileJava - jniCrossCompileOptions << JniCrossCompileOptions(nativeUtils.wpi.platforms.roborio) + jniCrossCompileOptions << JniCrossCompileOptions(nativeUtils.wpi.platforms.systemcore) jniCrossCompileOptions << JniCrossCompileOptions(nativeUtils.wpi.platforms.linuxarm32) jniCrossCompileOptions << JniCrossCompileOptions(nativeUtils.wpi.platforms.linuxarm64) diff --git a/shared/config.gradle b/shared/config.gradle index 0646f58e75..61e28db448 100644 --- a/shared/config.gradle +++ b/shared/config.gradle @@ -2,6 +2,7 @@ nativeUtils.addWpiNativeUtils() nativeUtils.withCrossLinuxArm32() nativeUtils.withCrossLinuxArm64() +nativeUtils.withCrossSystemCore() // Configure WPI dependencies. nativeUtils.wpi.configureDependencies {