Skip to content

Commit e9e24b7

Browse files
committed
Update for 2027, openssl 4.0.0, libssh 0.12.0
1 parent 0e59f02 commit e9e24b7

16 files changed

+65
-481
lines changed

.github/workflows/ci.yml

Lines changed: 30 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -6,147 +6,109 @@ jobs:
66
build-linux:
77
name: "Build - Linux"
88
runs-on: ubuntu-latest
9-
container: wpilib/ubuntu-base:22.04
9+
container: wpilib/ubuntu-base:24.04
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v6
1212
with:
1313
submodules: true
1414

1515
- name: Build
1616
run: ./gradlew build
1717

18-
- uses: actions/upload-artifact@v4
18+
- uses: actions/upload-artifact@v7
1919
with:
2020
name: Linux
2121
path: build/allOutputs
2222

23-
build-linux-arm32:
24-
name: "Build - Linux Arm32"
25-
runs-on: ubuntu-latest
26-
container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
27-
steps:
28-
- uses: actions/checkout@v4
29-
with:
30-
submodules: true
31-
32-
- name: Build
33-
run: ./gradlew build -Pforcecrossbuild=linux-arm32
34-
35-
- uses: actions/upload-artifact@v4
36-
with:
37-
name: Linux Arm32
38-
path: build/allOutputs
39-
4023
build-linux-arm64:
4124
name: "Build - Linux Arm64"
4225
runs-on: ubuntu-latest
43-
container: wpilib/aarch64-cross-ubuntu:bullseye-22.04
26+
container: wpilib/aarch64-cross-ubuntu:2027-bookworm-24.04
4427
steps:
45-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v6
4629
with:
4730
submodules: true
4831

4932
- name: Build
5033
run: ./gradlew build -Pforcecrossbuild=linux-arm64
5134

52-
- uses: actions/upload-artifact@v4
35+
- uses: actions/upload-artifact@v7
5336
with:
5437
name: Linux Arm64
5538
path: build/allOutputs
5639

57-
build-linux-athena:
58-
name: "Build - Linux Athena"
59-
runs-on: ubuntu-latest
60-
container: wpilib/roborio-cross-ubuntu:2024-22.04
61-
steps:
62-
- uses: actions/checkout@v4
63-
with:
64-
submodules: true
65-
66-
- name: Build
67-
run: ./gradlew build -Pforcecrossbuild=linux-athena
68-
69-
- uses: actions/upload-artifact@v4
70-
with:
71-
name: Linux Athena
72-
path: build/allOutputs
73-
7440
build-windows:
7541
strategy:
7642
fail-fast: false
7743
matrix:
7844
include:
7945
- artifact-name: Win64
80-
architecture: x64
81-
vc: vcvars64.bat
82-
- artifact-name: Win32
83-
architecture: x86
84-
vc: vcvars32.bat
46+
vc: amd64
8547
- artifact-name: WinArm64
86-
architecture: x64
87-
vc: vcvarsamd64_arm64.bat
48+
vc: amd64_arm64
8849
build-options: "-Pforcecrossbuild=windows-arm64"
8950
name: "Build - ${{ matrix.artifact-name }}"
90-
runs-on: windows-2019
51+
runs-on: windows-latest
9152
steps:
92-
- uses: actions/checkout@v4
53+
- uses: actions/checkout@v6
9354
with:
9455
submodules: true
9556

96-
- uses: actions/setup-java@v4
57+
- uses: actions/setup-java@v5
9758
with:
98-
java-version: 11
99-
distribution: 'zulu'
100-
architecture: ${{ matrix.architecture }}
59+
java-version: 25
60+
distribution: 'temurin'
10161

10262
- uses: ilammy/setup-nasm@v1
10363

64+
- uses: ilammy/msvc-dev-cmd@v1.13.0
65+
with:
66+
arch: ${{ matrix.vc }}
67+
10468
- name: Build with Gradle
105-
run: |
106-
@call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\${{ matrix.vc }}"
107-
gradlew build ${{ matrix.build-options }}
69+
run: gradlew build ${{ matrix.build-options }}
10870
shell: cmd
10971

110-
- uses: actions/upload-artifact@v4
72+
- uses: actions/upload-artifact@v7
11173
with:
11274
name: ${{ matrix.artifact-name }}
11375
path: build/allOutputs
11476

11577
build-macos:
11678
env:
117-
MACOSX_DEPLOYMENT_TARGET: 10.14
79+
MACOSX_DEPLOYMENT_TARGET: 11
11880
name: "Build - macOS"
119-
runs-on: macos-13
81+
runs-on: macos-15
12082
steps:
121-
- uses: actions/checkout@v4
83+
- uses: actions/checkout@v6
12284
with:
12385
submodules: true
12486

12587
- name: Build
12688
run: ./gradlew build
12789

128-
- uses: actions/upload-artifact@v4
90+
- uses: actions/upload-artifact@v7
12991
with:
13092
name: macOS
13193
path: build/allOutputs
13294

13395
combine:
13496
name: Combine
135-
needs: [ build-linux, build-windows, build-macos, build-linux-athena, build-linux-arm32, build-linux-arm64 ]
97+
needs: [ build-linux, build-windows, build-macos, build-linux-arm64 ]
13698
runs-on: ubuntu-latest
13799
steps:
138-
- uses: actions/checkout@v4
100+
- uses: actions/checkout@v6
139101
with:
140102
repository: wpilibsuite/build-tools
141-
- uses: actions/download-artifact@v4
103+
- uses: actions/download-artifact@v8
142104
with:
143105
path: combiner/products/build/allOutputs
144106
- name: Flatten Artifacts
145107
run: rsync -a --delete combiner/products/build/allOutputs/*/* combiner/products/build/allOutputs/
146-
- uses: actions/setup-java@v4
108+
- uses: actions/setup-java@v5
147109
with:
148-
java-version: 11
149-
distribution: 'zulu'
110+
java-version: 25
111+
distribution: 'temurin'
150112
- name: Combine
151113
if: |
152114
!startsWith(github.ref, 'refs/tags/v')
@@ -163,7 +125,7 @@ jobs:
163125
RUN_AZURE_ARTIFACTORY_RELEASE: 'TRUE'
164126
ARTIFACTORY_PUBLISH_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
165127
ARTIFACTORY_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
166-
- uses: actions/upload-artifact@v4
128+
- uses: actions/upload-artifact@v7
167129
with:
168130
name: Maven
169131
path: ~/releases

build.gradle

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import org.gradle.internal.os.OperatingSystem
22

33
plugins {
44
id "maven-publish"
5-
id "de.undercouch.download" version "5.4.0"
5+
id "de.undercouch.download" version "5.6.0"
66
}
77

88
// Project Version
9-
ext.pub_version = "0.105-1"
9+
ext.pub_version = "2027-0.120-1"
1010

1111
static def get_platform() {
1212
def platform
@@ -15,8 +15,6 @@ static def get_platform() {
1515

1616
if (os_arch == 'amd64') {
1717
os_arch = 'x86_64'
18-
} else if (os_arch == 'i386') {
19-
os_arch = 'x86'
2018
} else if (os_arch == 'aarch64' || os_arch == 'arm64') {
2119
os_arch = 'arm64'
2220
}
@@ -35,20 +33,12 @@ static def get_platform() {
3533
}
3634

3735
static def get_platform_path(platform) {
38-
if (platform == "linux-athena") {
39-
return "linux/athena"
40-
} else if (platform == "linux-arm32") {
41-
return "linux/arm32"
42-
} else if (platform == "linux-arm64") {
36+
if (platform == "linux-arm64") {
4337
return "linux/arm64"
44-
} else if (platform == "linux-x86") {
45-
return "linux/x86"
4638
} else if (platform == "linux-x86_64") {
4739
return "linux/x86-64"
4840
} else if (platform == "osx-universal") {
4941
return "osx/universal"
50-
} else if (platform == "windows-x86") {
51-
return "windows/x86"
5242
} else if (platform == "windows-x86_64") {
5343
return "windows/x86-64"
5444
} else if (platform == "windows-arm64") {
@@ -116,5 +106,5 @@ task build {
116106
apply from: "publish.gradle"
117107

118108
wrapper {
119-
gradleVersion = '8.5'
109+
gradleVersion = '9.4.1'
120110
}

cmake/aarch64-bullseye-gnu.toolchain.cmake

Lines changed: 0 additions & 5 deletions
This file was deleted.

cmake/arm-frc-gnueabi.toolchain.cmake

Lines changed: 0 additions & 4 deletions
This file was deleted.

cmake/arm-pi-gnueabihf.toolchain.cmake

Lines changed: 0 additions & 98 deletions
This file was deleted.

0 commit comments

Comments
 (0)