Update CI and dependency versions (#21)
This commit is contained in:
parent
24d5ee1a5b
commit
65f4e4f9fa
16
.github/workflows/ci.yml
vendored
16
.github/workflows/ci.yml
vendored
@ -8,7 +8,7 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- container: wpilib/roborio-cross-ubuntu:2023-22.04
|
- container: wpilib/roborio-cross-ubuntu:2024-22.04
|
||||||
artifact-name: Athena
|
artifact-name: Athena
|
||||||
build-options: "-Ponlylinuxathena"
|
build-options: "-Ponlylinuxathena"
|
||||||
# - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
|
# - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
|
||||||
@ -24,13 +24,13 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container: ${{ matrix.container }}
|
container: ${{ matrix.container }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
submodules: true
|
submodules: true
|
||||||
|
fetch-depth: 0
|
||||||
- name: Fetch all history and metadata
|
- name: Fetch all history and metadata
|
||||||
run: |
|
run: |
|
||||||
git config --global --add safe.directory /__w/vendor-template/vendor-template
|
git config --global --add safe.directory /__w/vendor-template/vendor-template
|
||||||
git fetch --prune --unshallow
|
|
||||||
- name: Build with Gradle
|
- name: Build with Gradle
|
||||||
run: ./gradlew build --max-workers 1 ${{ matrix.build-options }}
|
run: ./gradlew build --max-workers 1 ${{ matrix.build-options }}
|
||||||
- uses: actions/upload-artifact@v3
|
- uses: actions/upload-artifact@v3
|
||||||
@ -39,14 +39,16 @@ jobs:
|
|||||||
path: build/allOutputs
|
path: build/allOutputs
|
||||||
|
|
||||||
build-host:
|
build-host:
|
||||||
|
env:
|
||||||
|
MACOSX_DEPLOYMENT_TARGET: 11
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- os: windows-2019
|
- os: windows-2022
|
||||||
artifact-name: Win64
|
artifact-name: Win64
|
||||||
architecture: x64
|
architecture: x64
|
||||||
- os: macos-11
|
- os: macos-12
|
||||||
artifact-name: macOS
|
artifact-name: macOS
|
||||||
architecture: x64
|
architecture: x64
|
||||||
name: "Build - ${{ matrix.artifact-name }}"
|
name: "Build - ${{ matrix.artifact-name }}"
|
||||||
@ -74,7 +76,7 @@ jobs:
|
|||||||
needs: [build-docker, build-host]
|
needs: [build-docker, build-host]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: wpilibsuite/build-tools
|
repository: wpilibsuite/build-tools
|
||||||
- uses: actions/download-artifact@v3
|
- uses: actions/download-artifact@v3
|
||||||
@ -85,7 +87,7 @@ jobs:
|
|||||||
- uses: actions/setup-java@v3
|
- uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
distribution: 'zulu'
|
distribution: 'zulu'
|
||||||
java-version: 11
|
java-version: 17
|
||||||
- name: Combine
|
- name: Combine
|
||||||
# if: |
|
# if: |
|
||||||
# !startsWith(github.ref, 'refs/tags/v')
|
# !startsWith(github.ref, 'refs/tags/v')
|
||||||
|
@ -3,7 +3,7 @@ plugins {
|
|||||||
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 '2020.2'
|
||||||
id 'edu.wpi.first.NativeUtils' version '2024.2.0'
|
id 'edu.wpi.first.NativeUtils' version '2024.3.1'
|
||||||
id 'edu.wpi.first.GradleJni' version '1.0.0'
|
id 'edu.wpi.first.GradleJni' version '1.0.0'
|
||||||
id 'edu.wpi.first.GradleVsCode' version '1.3.0'
|
id 'edu.wpi.first.GradleVsCode' version '1.3.0'
|
||||||
}
|
}
|
||||||
|
@ -7,11 +7,11 @@ nativeUtils {
|
|||||||
wpi {
|
wpi {
|
||||||
configureDependencies {
|
configureDependencies {
|
||||||
wpiVersion = "2024.+"
|
wpiVersion = "2024.+"
|
||||||
opencvYear = "frc2023"
|
opencvYear = "frc2024"
|
||||||
googleTestYear = "frc2023"
|
googleTestYear = "frc2024"
|
||||||
niLibVersion = "2024.1.1"
|
niLibVersion = "2024.1.1"
|
||||||
opencvVersion = "4.6.0-5"
|
opencvVersion = "4.8.0-2"
|
||||||
googleTestVersion = "1.12.1-2"
|
googleTestVersion = "1.14.0-1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user