Resolve conflitcs and update pv

.github/workflows/build.yml

@@ -1,12 +1,21 @@
 name: Build
 
 on:
+  # Run on pushes to master and pushed tags, and on pull requests against master, but ignore the docs folder
   push:
     branches: [ master ]
     tags:
       - 'v*'
+    paths:
+      - '**'
+      - '!docs/**'
+      - '.github/**'
   pull_request:
     branches: [ master ]
+    paths:
+      - '**'
+      - '!docs/**'
+      - '.github/**'
 
 jobs:
   build-client:
@@ -55,13 +64,13 @@ jobs:
         run: |
           chmod +x gradlew
           ./gradlew copyPhotonlib -x check
-          ./gradlew build -x check --max-workers 2
+          ./gradlew build -x check
       - name: Build C++ examples
         working-directory: photonlib-cpp-examples
         run: |
           chmod +x gradlew
           ./gradlew copyPhotonlib -x check
-          ./gradlew build -x check --max-workers 2
+          ./gradlew build -x check
   build-gradle:
     name: "Gradle Build"
     runs-on: ubuntu-22.04
@@ -83,11 +92,11 @@ jobs:
       - name: Gradle Build
         run: |
           chmod +x gradlew
-          ./gradlew build -x check --max-workers 2
+          ./gradlew photon-targeting:build photon-core:build photon-server:build -x check
       - name: Gradle Tests
-        run: ./gradlew testHeadless -i --max-workers 1 --stacktrace
+        run: ./gradlew testHeadless -i --stacktrace
       - name: Gradle Coverage
-        run: ./gradlew jacocoTestReport --max-workers 1
+        run: ./gradlew jacocoTestReport
       - name: Publish Coverage Report
         uses: codecov/codecov-action@v3
         with:
@@ -101,37 +110,36 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-        with:
-          repository: 'PhotonVision/photonvision-docs.git'
-          ref: master
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.11'
       - name: Install dependencies
+        working-directory: docs
         run: |
           python -m pip install --upgrade pip
           pip install sphinx sphinx_rtd_theme sphinx-tabs sphinxext-opengraph doc8
           pip install -r requirements.txt
       - name: Build the docs
+        working-directory: docs
         run: |
           make html
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
         with:
           name: built-docs
-          path: build/html
+          path: docs/build/html
   build-photonlib-host:
     env:
-      MACOSX_DEPLOYMENT_TARGET: 12
+      MACOSX_DEPLOYMENT_TARGET: 13
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: windows-2022
             artifact-name: Win64
             architecture: x64
-          - os: macos-12
+          - os: macos-14
             artifact-name: macOS
-            architecture: x64
+            architecture: aarch64
           - os: ubuntu-22.04
             artifact-name: Linux
 
@@ -146,26 +154,37 @@ jobs:
         with:
           java-version: 17
           distribution: temurin
+          architecture: ${{ matrix.architecture }}
       - run: git fetch --tags --force
       - run: |
           chmod +x gradlew
-          ./gradlew photon-lib:build --max-workers 1
-      # - run: ./gradlew photon-lib:publish photon-targeting:publish
-      #   name: Publish
-      #   env:
-      #     ARTIFACTORY_API_KEY: ${{ secrets.ARTIFACTORY_API_KEY }}
-      #   if: github.event_name == 'push'
+          ./gradlew photon-targeting:build photon-lib:build -Pbuildalldesktop -i
+      - run: ./gradlew photon-lib:publish photon-targeting:publish -Pbuildalldesktop
+        name: Publish
+        env:
+          ARTIFACTORY_API_KEY: ${{ secrets.ARTIFACTORY_API_KEY }}
+        if: github.event_name == 'push' && github.repository_owner == 'photonvision'
+      # Copy artifacts to build/outputs/maven
+      - run: ./gradlew photon-lib:publish photon-targeting:publish -PcopyOfflineArtifacts -Pbuildalldesktop
+      - uses: actions/upload-artifact@v4
+        with:
+          name: maven-${{ matrix.artifact-name }}
+          path: build/outputs
+
   build-photonlib-docker:
     strategy:
       fail-fast: false
       matrix:
         include:
           - container: wpilib/roborio-cross-ubuntu:2024-22.04
             artifact-name: Athena
+            build-options: "-Ponlylinuxathena"
           - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
             artifact-name: Raspbian
+            build-options: "-Ponlylinuxarm32"
           - container: wpilib/aarch64-cross-ubuntu:bullseye-22.04
             artifact-name: Aarch64
+            build-options: "-Ponlylinuxarm64"
 
     runs-on: ubuntu-22.04
     container: ${{ matrix.container }}
@@ -178,16 +197,49 @@ jobs:
         run: |
           git config --global --add safe.directory /__w/photonvision/photonvision
       - name: Build PhotonLib
+        # We don't need to run tests, since we specify only non-native platforms
         run: |
           chmod +x gradlew
-          ./gradlew photon-lib:build --max-workers 1
-      # - name: Publish
-      #   run: |
-      #     chmod +x gradlew
-      #     ./gradlew photon-lib:publish photon-targeting:publish
+          ./gradlew photon-targeting:build photon-lib:build ${{ matrix.build-options }} -i -x test
+      - name: Publish
+        run: |
+          chmod +x gradlew
+          ./gradlew photon-lib:publish photon-targeting:publish ${{ matrix.build-options }}
         env:
           ARTIFACTORY_API_KEY: ${{ secrets.ARTIFACTORY_API_KEY }}
-        if: github.event_name == 'push'
+        if: github.event_name == 'push' && github.repository_owner == 'photonvision'
+      # Copy artifacts to build/outputs/maven
+      - run: ./gradlew photon-lib:publish photon-targeting:publish -PcopyOfflineArtifacts ${{ matrix.build-options }}
+      - uses: actions/upload-artifact@v4
+        with:
+          name: maven-${{ matrix.artifact-name }}
+          path: build/outputs
+
+  combine:
+    name: Combine
+    needs: [build-photonlib-docker, build-photonlib-host]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - run: git fetch --tags --force
+      # download all maven-* artifacts to outputs/
+      - uses: actions/download-artifact@v4
+        with:
+          merge-multiple: true
+          path: output
+          pattern: maven-*
+      - run: find .
+      - run: zip -r photonlib-$(git describe --tags --match=v*).zip .
+        name: ZIP stuff up
+        working-directory: output
+      - run: ls output
+      - uses: actions/upload-artifact@v4
+        with:
+          name: photonlib-offline
+          path: output/*.zip
+
   build-package:
     needs: [build-client, build-gradle, build-offline-docs]
 
@@ -198,23 +250,19 @@ jobs:
           - os: windows-latest
             artifact-name: Win64
             architecture: x64
-            arch-override: none
+            arch-override: winx64
           - os: macos-latest
             artifact-name: macOS
             architecture: x64
-            arch-override: none
-          - os: ubuntu-latest
-            artifact-name: Linux
-            architecture: x64
-            arch-override: none
+            arch-override: macx64
           - os: macos-latest
             artifact-name: macOSArm
             architecture: x64
             arch-override: macarm64
           - os: ubuntu-latest
-            artifact-name: LinuxArm32
+            artifact-name: Linux
             architecture: x64
-            arch-override: linuxarm32
+            arch-override: linuxx64
           - os: ubuntu-latest
             artifact-name: LinuxArm64
             architecture: x64
@@ -232,6 +280,7 @@ jobs:
         with:
           java-version: 17
           distribution: temurin
+          architecture: ${{ matrix.architecture }}
       - run: |
           rm -rf photon-server/src/main/resources/web/*
           mkdir -p photon-server/src/main/resources/web/docs
@@ -250,11 +299,11 @@ jobs:
           path: photon-server/src/main/resources/web/docs
       - run: |
           chmod +x gradlew
-          ./gradlew photon-server:shadowJar --max-workers 2 -PArchOverride=${{ matrix.arch-override }}
+          ./gradlew photon-server:shadowJar -PArchOverride=${{ matrix.arch-override }}
         if: ${{ (matrix.arch-override != 'none') }}
       - run: |
           chmod +x gradlew
-          ./gradlew photon-server:shadowJar --max-workers 2
+          ./gradlew photon-server:shadowJar
         if: ${{ (matrix.arch-override == 'none') }}
       - uses: actions/upload-artifact@v4
         with:
@@ -310,7 +359,7 @@ jobs:
           - os: ubuntu-latest
             artifact-name: LinuxArm64
             image_suffix: RaspberryPi
-            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.4/photonvision_raspi.img.xz
+            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-1/photonvision_raspi.img.xz
             cpu: cortex-a7
             image_additional_mb: 0
             extraOpts: -Djdk.lang.Process.launchMechanism=vfork
@@ -349,33 +398,45 @@ jobs:
           - os: ubuntu-latest
             artifact-name: LinuxArm64
             image_suffix: RaspberryPi
-            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.4/photonvision_raspi.img.xz
+            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-1/photonvision_raspi.img.xz
             cpu: cortex-a7
             image_additional_mb: 0
           - os: ubuntu-latest
             artifact-name: LinuxArm64
             image_suffix: limelight2
-            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.4/photonvision_limelight.img.xz
+            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-1/photonvision_limelight.img.xz
             cpu: cortex-a7
-            image_additional_mb: 4096
+            image_additional_mb: 0
           - os: ubuntu-latest
             artifact-name: LinuxArm64
             image_suffix: limelight3
-            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.5/photonvision_limelight3.img.xz
+            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-1/photonvision_limelight3.img.xz
             cpu: cortex-a7
             image_additional_mb: 0
           - os: ubuntu-latest
             artifact-name: LinuxArm64
             image_suffix: orangepi5
-            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.10/photonvision_opi5.img.xz
+            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-3/photonvision_opi5.img.xz
+            cpu: cortex-a8
+            image_additional_mb: 1024
+          - os: ubuntu-latest
+            artifact-name: LinuxArm64
+            image_suffix: orangepi5b
+            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-3/photonvision_opi5b.img.xz
             cpu: cortex-a8
-            image_additional_mb: 4096
+            image_additional_mb: 1024
           - os: ubuntu-latest
             artifact-name: LinuxArm64
             image_suffix: orangepi5plus
-            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.10/photonvision_opi5plus.img.xz
+            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-3/photonvision_opi5plus.img.xz
             cpu: cortex-a8
-            image_additional_mb: 4096
+            image_additional_mb: 1024
+          - os: ubuntu-latest
+            artifact-name: LinuxArm64
+            image_suffix: orangepi5pro
+            image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-3/photonvision_opi5pro.img.xz
+            cpu: cortex-a8
+            image_additional_mb: 1024
 
     runs-on: ${{ matrix.os }}
     name: "Build image - ${{ matrix.image_url }}"
@@ -388,7 +449,7 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: jar-${{ matrix.artifact-name }}
-      - uses: pguyot/arm-runner-action@v2
+      - uses: pguyot/arm-runner-action@HEAD
         name: Generate image
         id: generate_image
         with:
@@ -413,12 +474,25 @@ jobs:
           name: image-${{ matrix.image_suffix }}
           path: photonvision*.xz
   release:
-    needs: [build-package, build-image]
+    needs: [build-package, build-image, combine]
     runs-on: ubuntu-22.04
     steps:
-      # Download literally every single artifact. This also downloads client and docs,
-      # but the filtering below won't pick these up (I hope)
+      # Download all fat JARs
+      - uses: actions/download-artifact@v4
+        with:
+          merge-multiple: true
+          pattern: jar-*
+      # Download offline photonlib
+      - uses: actions/download-artifact@v4
+        with:
+          merge-multiple: true
+          pattern: photonlib-offline
+      # Download all images
       - uses: actions/download-artifact@v4
+        with:
+          merge-multiple: true
+          pattern: image-*
+
       - run: find
       # Push to dev release
       - uses: pyTooling/Actions/releaser@r0
@@ -430,6 +504,7 @@ jobs:
             **/*.xz
             **/*.jar
             **/photonlib*.json
+            **/photonlib*.zip
         if: github.event_name == 'push'
       # Upload all jars and xz archives
       - uses: softprops/action-gh-release@v1
@@ -438,6 +513,7 @@ jobs:
             **/*.xz
             **/*.jar
             **/photonlib*.json
+            **/photonlib*.zip
         if: startsWith(github.ref, 'refs/tags/v')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint-format.yml

@@ -1,12 +1,21 @@
 name: Lint and Format
 
 on:
+  # Run on pushes to master and pushed tags, and on pull requests against master, but ignore the docs folder
   push:
     branches: [ master ]
     tags:
       - 'v*'
+    paths:
+      - '**'
+      - '!docs/**'
+      - '.github/**'
   pull_request:
     branches: [ master ]
+    paths:
+      - '**'
+      - '!docs/**'
+      - '.github/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
@@ -26,9 +35,9 @@ jobs:
       - name: Set up Python 3.8
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.11
       - name: Install wpiformat
-        run: pip3 install wpiformat
+        run: pip3 install wpiformat==2024.37
       - name: Run
         run: wpiformat
       - name: Check output