Skip to content

Commit c392005

Browse files
authored
Update for 2024, openssl 3.1.3, libssh 0.10.5 (#19)
1 parent 6afed82 commit c392005

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
build-linux-athena:
5858
name: "Build - Linux Athena"
5959
runs-on: ubuntu-latest
60-
container: wpilib/roborio-cross-ubuntu:2023-22.04
60+
container: wpilib/roborio-cross-ubuntu:2024-22.04
6161
steps:
6262
- uses: actions/checkout@v3
6363
with:

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
// Project Version
9-
ext.pub_version = "0.95-8"
9+
ext.pub_version = "0.105-1"
1010

1111
static def get_platform() {
1212
def platform
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
set(GCC_COMPILER_VERSION "" CACHE STRING "GCC Compiler version")
2-
set(GNU_MACHINE "arm-frc2023-linux-gnueabi" CACHE STRING "GNU compiler triple")
2+
set(GNU_MACHINE "arm-frc2024-linux-gnueabi" CACHE STRING "GNU compiler triple")
33
set(SOFTFP yes)
44
include("${CMAKE_CURRENT_LIST_DIR}/arm.toolchain.cmake")

libssh-mirror

Submodule libssh-mirror updated from e832281 to 479eca1

openssl

Submodule openssl updated 1172 files

openssl.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ project.tasks.create("configureOpenSSL", Exec) {
5757
args "linux-armv4"
5858
args "-DL_ENDIAN"
5959
args "-latomic"
60-
args "--cross-compile-prefix=arm-frc2023-linux-gnueabi-"
60+
args "--cross-compile-prefix=arm-frc2024-linux-gnueabi-"
6161
} else if (project.platform == "linux-arm64") {
6262
args "linux-aarch64"
6363
if (project.hasProperty('forcecrossbuild')) {

publish.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ def openssl_license_file = file("openssl/LICENSE.txt")
55

66
// Define names for publishing.
77
def base_artifact_id = "libssh"
8-
def artifact_group_id = "edu.wpi.first.thirdparty.frc2023"
8+
def artifact_group_id = "edu.wpi.first.thirdparty.frc2024"
99

1010
// Define names for archives.
11-
def zip_base_name = "_GROUP_edu_wpi_first_thirdparty_frc2023_ID_libssh_CLS"
11+
def zip_base_name = "_GROUP_edu_wpi_first_thirdparty_frc2024_ID_libssh_CLS"
1212

1313
// Generate version number.
1414
def version_file = file("$outputs_dir/version.txt")

0 commit comments

Comments
 (0)