NoahLacks63/MotionTragic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump dependency versions to fix build (#15)

Browse Source
This commit is contained in:
Tyler Veness 2023-02-17 17:59:22 -08:00 committed by GitHub
parent 2f525be5ea
commit 7e40e8d636
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/ci.yml vendored
View File

@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: ${{ matrix.container }} container: ${{ matrix.container }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
submodules: true submodules: true
- name: Fetch all history and metadata - name: Fetch all history and metadata
@ -33,7 +33,7 @@ jobs:
git fetch --prune --unshallow 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@v2 - uses: actions/upload-artifact@v3
with: with:
name: ${{ matrix.artifact-name }} name: ${{ matrix.artifact-name }}
path: build/allOutputs path: build/allOutputs
@ -52,18 +52,19 @@ jobs:
name: "Build - ${{ matrix.artifact-name }}" name: "Build - ${{ matrix.artifact-name }}"
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
submodules: true submodules: true
- name: Fetch all history and metadata - name: Fetch all history and metadata
run: git fetch --prune --unshallow run: git fetch --prune --unshallow
- uses: actions/setup-java@v1 - uses: actions/setup-java@v3
with: with:
java-version: 11 distribution: 'zulu'
java-version: 17
architecture: ${{ matrix.architecture }} architecture: ${{ matrix.architecture }}
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew build -Pbuildalldesktop run: ./gradlew build -Pbuildalldesktop
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v3
with: with:
name: ${{ matrix.artifact-name }} name: ${{ matrix.artifact-name }}
path: build/allOutputs path: build/allOutputs
@ -73,16 +74,17 @@ jobs:
needs: [build-docker, build-host] needs: [build-docker, build-host]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
repository: wpilibsuite/build-tools repository: wpilibsuite/build-tools
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v3
with: with:
path: combiner/products/build/allOutputs path: combiner/products/build/allOutputs
- name: Flatten Artifacts - name: Flatten Artifacts
run: rsync -a --delete combiner/products/build/allOutputs/*/* combiner/products/build/allOutputs/ run: rsync -a --delete combiner/products/build/allOutputs/*/* combiner/products/build/allOutputs/
- uses: actions/setup-java@v1 - uses: actions/setup-java@v3
with: with:
distribution: 'zulu'
java-version: 11 java-version: 11
- name: Combine - name: Combine
# if: | # if: |
@ -100,7 +102,7 @@ jobs:
# RUN_AZURE_ARTIFACTORY_RELEASE: 'TRUE' # RUN_AZURE_ARTIFACTORY_RELEASE: 'TRUE'
# ARTIFACTORY_PUBLISH_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} # ARTIFACTORY_PUBLISH_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
# ARTIFACTORY_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} # ARTIFACTORY_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v3
with: with:
name: Maven name: Maven
path: ~/releases path: ~/releases

2
build.gradle
View File

@ -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 '2023.6.0' id 'edu.wpi.first.NativeUtils' version '2023.11.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'
} }

8
config.gradle
View File

@ -7,11 +7,9 @@ nativeUtils {
wpi { wpi {
configureDependencies { configureDependencies {
wpiVersion = "2023.+" wpiVersion = "2023.+"
niLibVersion = "2023.1.0" niLibVersion = "2023.3.0"
opencvVersion = "4.6.0-2" opencvVersion = "4.6.0-3"
googleTestVersion = "1.11.0-3" googleTestVersion = "1.12.1-1"
imguiVersion = "1.88-8"
wpimathVersion = "2023.+"
} }
} }
} }