2023 wpilib update nt4 sim shenanigans

.github/workflows/main.yml

@@ -255,10 +255,40 @@ jobs:
         if: ${{ failure() }}
 
   photon-build-package:
-    needs: [photonclient-build, photon-build-all, photonserver-build-offline-docs, photonlib-build-host, photonlib-build-docker]
+    needs: [photonclient-build, photon-build-all, photonserver-build-offline-docs]
+
+    strategy:
+        fail-fast: false
+        matrix:
+          include:
+            - os: windows-latest
+              artifact-name: Win64
+              architecture: x64
+              arch-override: none
+            - os: macos-latest
+              artifact-name: macOS
+              architecture: x64
+              arch-override: none
+            - os: ubuntu-latest
+              artifact-name: Linux
+              architecture: x64
+              arch-override: none
+            - os: macos-latest
+              artifact-name: macOSArm
+              architecture: x64
+              arch-override: macarm64
+            - os: ubuntu-latest
+              artifact-name: LinuxArm32
+              architecture: x64
+              arch-override: linuxarm32
+            - os: ubuntu-latest
+              artifact-name: LinuxArm64
+              architecture: x64
+              arch-override: linuxarm64
 
     # The type of runner that the job will run on.
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.os }}
+    name: "Build fat JAR - ${{ matrix.artifact-name }}"
 
     steps:
       # Checkout code.
@@ -276,6 +306,11 @@ jobs:
       - run: |
           rm -rf photon-server/src/main/resources/web/*
           mkdir -p photon-server/src/main/resources/web/docs
+        if: ${{ (matrix.os) != 'windows-latest' }}
+      - run: |
+          del photon-server\src\main\resources\web\*.*
+          mkdir photon-server\src\main\resources\web\docs
+        if: ${{ (matrix.os) == 'windows-latest' }}
 
       # Download client artifact to resources folder.
       - uses: actions/download-artifact@v3
@@ -292,23 +327,28 @@ jobs:
       # Build fat jar for both pi and everything
       - run: |
           chmod +x gradlew
-          ./gradlew photon-server:shadowJar --max-workers 1
-          ./gradlew photon-server:shadowJar --max-workers 1 -Ppionly
+          ./gradlew photon-server:shadowJar --max-workers 2 -PArchOverride=${{ matrix.arch-override }}
+        if: ${{ (matrix.arch-override != 'none') }}
+      - run: |
+          chmod +x gradlew
+          ./gradlew photon-server:shadowJar --max-workers 2
+        if: ${{ (matrix.arch-override == 'none') }}
 
       # The image will only pull the Pi JAR in
       - name: Generate image
-        if: github.event_name != 'pull_request'
+        if: ${{ github.event_name != 'pull_request' && (matrix.artifact-name) == 'LinuxArm32' }}
         run: |
           chmod +x scripts/generatePiImage.sh
           ./scripts/generatePiImage.sh
 
       # Upload final fat jar as artifact.
       - uses: actions/upload-artifact@v3
         with:
-          name: jars
+          name: ${{ matrix.artifact-name }}-jar
           path: photon-server/build/libs
+
       - uses: actions/upload-artifact@v3
-        if: github.event_name != 'pull_request'
+        if: ${{ github.event_name != 'pull_request' && (matrix.artifact-name) == 'LinuxArm32' }}
         with:
           name: image
           path: photonvision*.xz

build.gradle

@@ -7,8 +7,11 @@ plugins {
     id "edu.wpi.first.NativeUtils" version "2023.8.2" apply false
     id "edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin" version "2020.2"
     id "org.hidetake.ssh" version "2.10.1"
+    id 'edu.wpi.first.WpilibTools' version '1.0.0'
 }
 
+import org.gradle.api.internal.artifacts.dependencies.DefaultExternalModuleDependency;
+
 allprojects {
     repositories {
         mavenCentral()
@@ -22,8 +25,8 @@ allprojects {
 apply from: "versioningHelper.gradle"
 
 ext {
-    wpilibVersion = "2023.1.1-beta-4-66-g8f40264"
-    opencvVersion = "4.6.0-3"
+    wpilibVersion = "2023.1.1-beta-6"
+    opencvVersion = "4.6.0-4"
     joglVersion = "2.4.0-rc-20200307"
     pubVersion = versionString
     isDev = pubVersion.startsWith("dev")
@@ -38,8 +41,11 @@ ext {
     }
 
     println("Building for archs " + jniPlatforms)
+
 }
 
+wpilibTools.deps.wpilibVersion = wpilibVersion
+
 spotless {
     java {
         toggleOffOn()

photon-client/src/components/common/cv-image.vue

@@ -9,6 +9,7 @@
   >
 </template>
 
+
 <script>
     export default {
         name: "CvImage",

photon-client/src/components/common/cv-input.vue

@@ -26,7 +26,7 @@
     </v-row>
   </div>
 </template>
-s
+
 <script>
     import TooltippedLabel from "./cv-tooltipped-label";