[photonlib] Fix C++ compilation errors (#266)

Properly builds linux athena artifacts and fixes vendor JSON bug
This commit is contained in:
Matt
2021-03-28 14:36:03 -07:00
committed by GitHub
parent 49fcdb64ed
commit 3948650e6c
3 changed files with 14 additions and 8 deletions

View File

@@ -225,7 +225,9 @@ jobs:
runs-on: ${{ matrix.os }}
name: "Photonlib - Build - ${{ matrix.artifact-name }}"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.3.4
with:
fetch-depth: 0
- uses: actions/setup-java@v1
with:
java-version: 11
@@ -244,7 +246,7 @@ jobs:
fail-fast: false
matrix:
include:
- container: wpilib/roborio-cross-ubuntu:2020-18.04
- container: wpilib/roborio-cross-ubuntu:2021-18.04
artifact-name: Athena
- container: wpilib/raspbian-cross-ubuntu:10-18.04
artifact-name: Raspbian
@@ -255,11 +257,14 @@ jobs:
container: ${{ matrix.container }}
name: "Photonlib - Build - ${{ matrix.artifact-name }}"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.3.4
with:
fetch-depth: 0
- uses: actions/setup-java@v1
with:
java-version: 11
- run: git fetch --tags --force
- run: |
git describe --tags --exclude="Dev"
- run: |
chmod +x gradlew
./gradlew photon-lib:build

View File

@@ -4,13 +4,14 @@
"version": "${photon_version}",
"uuid": "515fe07e-bfc6-11fa-b3de-0242ac130004 ",
"mavenUrls": [
"https://maven.photonvision.org/repository/internal"
"https://maven.photonvision.org/repository/internal",
"https://maven.photonvision.org/repository/snapshots"
],
"jsonUrl": "https://maven.photonvision.org/repository/internal/org/photonvision/lib/PhotonLib-json/1.0/PhotonLib-json-1.0.json",
"jniDependencies": [],
"cppDependencies": [
{
"groupId": "org.photonvision.lib",
"groupId": "org.photonvision",
"artifactId": "PhotonLib-cpp",
"version": "${photon_version}",
"libName": "Photon",

View File

@@ -15,8 +15,8 @@ gradle.allprojects {
} catch(Exception e) {
tagIsh = "dev-Unknown"
}
boolean isDev = tagIsh.matches(".*-[0-9]*-g[0-9a-f]*")
if(isDev) tagIsh = "dev-" + tagIsh
// boolean isDev = tagIsh.matches(".*-[0-9]*-g[0-9a-f]*")
// if(isDev) tagIsh = "dev-" + tagIsh
println("Picked up version: " + tagIsh)
return tagIsh
}