From 4c84c87cf4f4a49b1c269a488b8416b3b844ddd9 Mon Sep 17 00:00:00 2001 From: Craig Schardt Date: Sun, 20 Oct 2024 20:59:25 -0700 Subject: [PATCH] Bump Raspberry Pi images to v2025.0.0-beta-6 (#1483) Fixes #1482 --- .github/workflows/build.yml | 14 +++++++------- .../common/networking/NetworkManager.java | 3 --- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5636bcc6fd..15458a4bd6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -400,43 +400,43 @@ jobs: - os: ubuntu-22.04 artifact-name: LinuxArm64 image_suffix: RaspberryPi - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-4/photonvision_raspi.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-6/photonvision_raspi.img.xz cpu: cortex-a7 image_additional_mb: 0 - os: ubuntu-22.04 artifact-name: LinuxArm64 image_suffix: limelight2 - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-4/photonvision_limelight.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-6/photonvision_limelight.img.xz cpu: cortex-a7 image_additional_mb: 0 - os: ubuntu-22.04 artifact-name: LinuxArm64 image_suffix: limelight3 - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-4/photonvision_limelight3.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-6/photonvision_limelight3.img.xz cpu: cortex-a7 image_additional_mb: 0 - os: ubuntu-22.04 artifact-name: LinuxArm64 image_suffix: orangepi5 - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-3/photonvision_opi5.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-6/photonvision_opi5.img.xz cpu: cortex-a8 image_additional_mb: 1024 - os: ubuntu-22.04 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 + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-6/photonvision_opi5b.img.xz cpu: cortex-a8 image_additional_mb: 1024 - os: ubuntu-22.04 artifact-name: LinuxArm64 image_suffix: orangepi5plus - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-3/photonvision_opi5plus.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-6/photonvision_opi5plus.img.xz cpu: cortex-a8 image_additional_mb: 1024 - os: ubuntu-22.04 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 + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.0-beta-6/photonvision_opi5pro.img.xz cpu: cortex-a8 image_additional_mb: 1024 - os: ubuntu-latest diff --git a/photon-core/src/main/java/org/photonvision/common/networking/NetworkManager.java b/photon-core/src/main/java/org/photonvision/common/networking/NetworkManager.java index a53451b3a6..8708682522 100644 --- a/photon-core/src/main/java/org/photonvision/common/networking/NetworkManager.java +++ b/photon-core/src/main/java/org/photonvision/common/networking/NetworkManager.java @@ -93,7 +93,6 @@ public void initialize(boolean shouldManage) { if (config.networkManagerIface == null || config.networkManagerIface.isBlank()) { // if it's also empty, there is nothing to configure logger.error("No valid network interfaces to manage"); - // TODO: add a thread that monitors the network return; } } @@ -184,7 +183,6 @@ private void setConnectionDHCP(NetworkConfig config) { var shell = new ShellExec(); try { - // set nmcli back to DHCP, and re-run dhclient -- this ought to grab a new IP address if (NetworkUtils.connDoesNotExist(connName)) { // create connection logger.info("Creating the DHCP connection " + connName ); @@ -231,7 +229,6 @@ private void setConnectionStatic(NetworkConfig config) { var shell = new ShellExec(); try { - // set nmcli back to DHCP, and re-run dhclient -- this ought to grab a new IP address if (NetworkUtils.connDoesNotExist(connName)) { // create connection logger.info("Creating the Static connection " + connName );