Update CI and dependency versions (#21)

This commit is contained in:
Ryan Blue 2023-12-17 17:04:04 -05:00 committed by GitHub
parent 24d5ee1a5b
commit 65f4e4f9fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 12 deletions

View File

@ -8,7 +8,7 @@ jobs:
fail-fast: false
matrix:
include:
- container: wpilib/roborio-cross-ubuntu:2023-22.04
- container: wpilib/roborio-cross-ubuntu:2024-22.04
artifact-name: Athena
build-options: "-Ponlylinuxathena"
# - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
@ -24,13 +24,13 @@ jobs:
runs-on: ubuntu-latest
container: ${{ matrix.container }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 0
- name: Fetch all history and metadata
run: |
git config --global --add safe.directory /__w/vendor-template/vendor-template
git fetch --prune --unshallow
- name: Build with Gradle
run: ./gradlew build --max-workers 1 ${{ matrix.build-options }}
- uses: actions/upload-artifact@v3
@ -39,14 +39,16 @@ jobs:
path: build/allOutputs
build-host:
env:
MACOSX_DEPLOYMENT_TARGET: 11
strategy:
fail-fast: false
matrix:
include:
- os: windows-2019
- os: windows-2022
artifact-name: Win64
architecture: x64
- os: macos-11
- os: macos-12
artifact-name: macOS
architecture: x64
name: "Build - ${{ matrix.artifact-name }}"
@ -74,7 +76,7 @@ jobs:
needs: [build-docker, build-host]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: wpilibsuite/build-tools
- uses: actions/download-artifact@v3
@ -85,7 +87,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 11
java-version: 17
- name: Combine
# if: |
# !startsWith(github.ref, 'refs/tags/v')

View File

@ -3,7 +3,7 @@ plugins {
id 'java'
id 'google-test'
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.GradleVsCode' version '1.3.0'
}

View File

@ -7,11 +7,11 @@ nativeUtils {
wpi {
configureDependencies {
wpiVersion = "2024.+"
opencvYear = "frc2023"
googleTestYear = "frc2023"
opencvYear = "frc2024"
googleTestYear = "frc2024"
niLibVersion = "2024.1.1"
opencvVersion = "4.6.0-5"
googleTestVersion = "1.12.1-2"
opencvVersion = "4.8.0-2"
googleTestVersion = "1.14.0-1"
}
}
}