Skip to content

Commit 0e97e33

Browse files
authored
Update to 2025 beta image (#23)
* Update to 2025 beta image * Fix CI
1 parent c48be89 commit 0e97e33

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77
name: Build
88
runs-on: ubuntu-latest
9-
container: wpilib/roborio-cross-ubuntu:2023-22.04
9+
container: wpilib/roborio-cross-ubuntu:2024-22.04
1010
steps:
1111
- uses: actions/checkout@v4
1212
with:
@@ -16,8 +16,8 @@ jobs:
1616

1717
- uses: actions/setup-java@v4
1818
with:
19-
java-version: 11
20-
distribution: 'zulu'
19+
distribution: 'temurin'
20+
java-version: 17
2121

2222
- name: Publish
2323
run: |

build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id 'base'
55
id 'maven-publish'
66
id "com.jfrog.artifactory" version "4.29.3"
7-
id 'edu.wpi.first.NativeUtils' version '2023.10.0'
7+
id 'edu.wpi.first.NativeUtils' version '2025.3.0'
88
id 'cpp'
99
id 'c'
1010
}
@@ -85,8 +85,8 @@ class FileDependencySet implements NativeDependencySet {
8585
}
8686

8787
def netCommDependencySet = new FileDependencySet(project.files(
88-
'src/lib/netcomm/libFRC_NetworkCommunication.so.24.0.0',
89-
'src/lib/chipobject/libRoboRIO_FRC_ChipObject.so.24.0.0',
88+
'src/lib/netcomm/libFRC_NetworkCommunication.so.25.0.0',
89+
'src/lib/chipobject/libRoboRIO_FRC_ChipObject.so.25.0.0',
9090
'src/lib/visa/libvisa.so.23.3.0'),
9191
project.files())
9292

@@ -175,7 +175,7 @@ ext.addTaskToCopyAllOutputs = { task ->
175175
copyAllOutputs.from task.archivePath
176176
}
177177

178-
def pubVersion = '2024.2.1'
178+
def pubVersion = '2025.0.0'
179179

180180
def baseArtifactId = 'chipobject'
181181
def artifactGroupId = 'edu.wpi.first.ni-libraries'

src/include/FRC_NetworkCommunication/UsageReporting.h

+2
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ typedef enum
136136
kResourceType_Redux_future5,
137137
kResourceType_RevSparkFlexCAN,
138138
kResourceType_RevSparkFlexPWM,
139+
140+
// kResourceType_MaximumID = 255,
139141
} tResourceType;
140142

141143
typedef enum
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)