From 3948650e6ccbcd7b3ae54d0c2f415deb441dbd43 Mon Sep 17 00:00:00 2001
From: Matt <matthew.morley.ca@gmail.com>
Date: Sun, 28 Mar 2021 14:36:03 -0700
Subject: [PATCH] [photonlib] Fix C++ compilation errors (#266)

Properly builds linux athena artifacts and fixes vendor JSON bug
---
 .github/workflows/main.yml                | 13 +++++++++----
 photon-lib/src/generate/photonlib.json.in |  5 +++--
 versioningHelper.gradle                   |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a4fc5e18d..1b9bc7b15 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -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
diff --git a/photon-lib/src/generate/photonlib.json.in b/photon-lib/src/generate/photonlib.json.in
index e21397477..2faa81eb0 100644
--- a/photon-lib/src/generate/photonlib.json.in
+++ b/photon-lib/src/generate/photonlib.json.in
@@ -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",
diff --git a/versioningHelper.gradle b/versioningHelper.gradle
index d70670f73..f543b8a3b 100644
--- a/versioningHelper.gradle
+++ b/versioningHelper.gradle
@@ -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
     }