Bump orangepi versions to 24.04

.github/workflows/main.yml

@@ -29,15 +29,15 @@ jobs:
             base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-03-15/2024-03-15-raspios-bookworm-arm64-lite.img.xz
           - name: opi5
             script: ./install_opi5.sh
-            base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v1.33/ubuntu-22.04.3-preinstalled-server-arm64-orangepi-5.img.xz
+            base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.2.1/ubuntu-24.04-preinstalled-server-arm64-orangepi-5.img.xz
           - name: opi5plus
             script: ./install_opi5.sh
-            base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v1.33/ubuntu-22.04.3-preinstalled-server-arm64-orangepi-5-plus.img.xz
+            base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.1.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-plus.img.xz
 
     name: "Build for ${{ matrix.name }}"
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.7
       with:
         fetch-depth: 0
     - name: Fetch tags
@@ -58,7 +58,7 @@ jobs:
         mv ${{ steps.install_deps.outputs.image }} photonvision_${{ matrix.name }}.img
         sudo xz -T 0 -v photonvision_${{ matrix.name }}.img
 
-    - uses: actions/upload-artifact@master
+    - uses: actions/upload-artifact@v4.3.3
       with:
         name: photonvision_${{ matrix.name }}.img.xz
         path: photonvision_${{ matrix.name }}.img.xz
@@ -70,10 +70,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       # Download literally every single artifact
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v4.1.7
       - run: find
       # Push to dev release
-      - uses: pyTooling/Actions/releaser@r0
+      - uses: pyTooling/Actions/releaser@v1.0.5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag: 'Dev'
@@ -82,7 +82,7 @@ jobs:
             **/*.xz
         if: github.event_name == 'push'
       # Upload all xz archives to GH tag if tagged
-      - uses: softprops/action-gh-release@v1
+      - uses: softprops/action-gh-release@v2.0.6
         with:
           files: |
             **/*.xz

install_opi5.sh

@@ -17,27 +17,39 @@ chmod +x install.sh
 
 sed -i 's/# AllowedCPUs=4-7/AllowedCPUs=4-7/g' install.sh
 
-./install.sh
+./install.sh -n -q
 rm install.sh
 
 
 # Remove extra packages 
 echo "Purging extra things"
-apt-get remove -y gdb gcc g++ linux-headers* libgcc*-dev
-apt-get remove -y snapd
+# apt-get remove -y gdb gcc g++ linux-headers* libgcc*-dev
+# apt-get remove -y snapd
 apt-get autoremove -y
 
 
 echo "Installing additional things"
 sudo apt-get update
 apt-get install -y network-manager net-tools libatomic1
+
+apt-get install -y libc6 libstdc++6
+
+# cat > /etc/netplan/00-default-nm-renderer.yaml <<EOF
+# network:
+#   renderer: NetworkManager
+# EOF
+
+if [ $(cat /etc/lsb-release | grep -c "24.04") -gt 0 ]; then
+    # add jammy to apt sources 
+    echo "Adding jammy to list of apt sources"
+    add-apt-repository -y -S 'deb http://ports.ubuntu.com/ubuntu-ports jammy main universe'
+fi
+
+apt-get update
+
 # mrcal stuff
 apt-get install -y libcholmod3 liblapack3 libsuitesparseconfig5
 
-cat > /etc/netplan/00-default-nm-renderer.yaml <<EOF
-network:
-  renderer: NetworkManager
-EOF
 
 rm -rf /var/lib/apt/lists/*
 apt-get clean