Various fixes (#45)
* update nativeutils to fix arm builds * Pin CI to 22.04 and fix macos arch + target * update opencv version
This commit is contained in:
parent
9419c4cf30
commit
e7a7440903
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
@ -21,7 +21,7 @@ jobs:
|
|||||||
artifact-name: Linux
|
artifact-name: Linux
|
||||||
build-options: ""
|
build-options: ""
|
||||||
name: "Build - ${{ matrix.artifact-name }}"
|
name: "Build - ${{ matrix.artifact-name }}"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-22.04
|
||||||
container: ${{ matrix.container }}
|
container: ${{ matrix.container }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
@ -40,7 +40,7 @@ jobs:
|
|||||||
|
|
||||||
build-host:
|
build-host:
|
||||||
env:
|
env:
|
||||||
MACOSX_DEPLOYMENT_TARGET: 13
|
MACOSX_DEPLOYMENT_TARGET: 13.3
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@ -50,7 +50,7 @@ jobs:
|
|||||||
architecture: x64
|
architecture: x64
|
||||||
- os: macos-14
|
- os: macos-14
|
||||||
artifact-name: macOS
|
artifact-name: macOS
|
||||||
architecture: x64
|
architecture: aarch64
|
||||||
name: "Build - ${{ matrix.artifact-name }}"
|
name: "Build - ${{ matrix.artifact-name }}"
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
@ -74,7 +74,7 @@ jobs:
|
|||||||
combine:
|
combine:
|
||||||
name: Combine
|
name: Combine
|
||||||
needs: [build-docker, build-host]
|
needs: [build-docker, build-host]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
|
@ -4,8 +4,8 @@ plugins {
|
|||||||
id 'cpp'
|
id 'cpp'
|
||||||
id 'java'
|
id 'java'
|
||||||
id 'google-test'
|
id 'google-test'
|
||||||
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.2'
|
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2025.0'
|
||||||
id 'edu.wpi.first.NativeUtils' version '2025.6.0'
|
id 'edu.wpi.first.NativeUtils' version '2025.8.0'
|
||||||
id 'edu.wpi.first.GradleJni' version '1.1.0'
|
id 'edu.wpi.first.GradleJni' version '1.1.0'
|
||||||
id 'edu.wpi.first.GradleVsCode' version '2.1.0'
|
id 'edu.wpi.first.GradleVsCode' version '2.1.0'
|
||||||
}
|
}
|
||||||
@ -45,7 +45,7 @@ dependencies {
|
|||||||
implementation "com.fasterxml.jackson.core:jackson-annotations:2.15.2"
|
implementation "com.fasterxml.jackson.core:jackson-annotations:2.15.2"
|
||||||
implementation "com.fasterxml.jackson.core:jackson-core:2.15.2"
|
implementation "com.fasterxml.jackson.core:jackson-core:2.15.2"
|
||||||
implementation "com.fasterxml.jackson.core:jackson-databind:2.15.2"
|
implementation "com.fasterxml.jackson.core:jackson-databind:2.15.2"
|
||||||
implementation 'edu.wpi.first.thirdparty.frc2024.opencv:opencv-java:4.8.0-4'
|
implementation 'edu.wpi.first.thirdparty.frc2025.opencv:opencv-java:4.10.0-2'
|
||||||
|
|
||||||
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
|
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
|
||||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||||
|
@ -9,9 +9,9 @@ nativeUtils {
|
|||||||
wpi {
|
wpi {
|
||||||
configureDependencies {
|
configureDependencies {
|
||||||
wpiVersion = wpilibVersion
|
wpiVersion = wpilibVersion
|
||||||
opencvYear = "frc2024"
|
opencvYear = "frc2025"
|
||||||
niLibVersion = "2025.0.0"
|
niLibVersion = "2025.0.0"
|
||||||
opencvVersion = "4.8.0-4"
|
opencvVersion = "4.10.0-2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user