From 1cc25a84630680dfaa73cb2c6f49bfe2dac4d1d8 Mon Sep 17 00:00:00 2001 From: Sam Freund Date: Wed, 8 Oct 2025 20:21:24 -0500 Subject: [PATCH 1/2] Modify build-image to use global variable for image version (#2111) --- .github/workflows/build.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23d78c40f6..d36d86709d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -376,7 +376,7 @@ jobs: - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: RaspberryPi - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.4/photonvision_raspi.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_raspi.img.xz cpu: cortex-a7 image_additional_mb: 0 extraOpts: -Djdk.lang.Process.launchMechanism=vfork @@ -406,7 +406,7 @@ jobs: build-image: needs: [build-package] - if: ${{ github.event_name != 'pull_request' }} + # if: ${{ github.event_name != 'pull_request' }} strategy: fail-fast: false @@ -415,67 +415,67 @@ jobs: - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: RaspberryPi - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.4/photonvision_raspi.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_raspi.img.xz cpu: cortex-a7 image_additional_mb: 0 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: limelight2 - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.4/photonvision_limelight.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_limelight.img.xz cpu: cortex-a7 image_additional_mb: 0 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: limelight3 - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.4/photonvision_limelight3.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_limelight3.img.xz cpu: cortex-a7 image_additional_mb: 0 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: limelight3G - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.4/photonvision_limelight3g.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_limelight3g.img.xz cpu: cortex-a7 image_additional_mb: 0 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: limelight4 - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.4/photonvision_limelight4.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_limelight4.img.xz cpu: cortex-a76 image_additional_mb: 0 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: orangepi5 - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.4/photonvision_opi5.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_opi5.img.xz cpu: cortex-a8 image_additional_mb: 1024 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: orangepi5b - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.4/photonvision_opi5b.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_opi5b.img.xz cpu: cortex-a8 image_additional_mb: 1024 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: orangepi5plus - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.4/photonvision_opi5plus.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_opi5plus.img.xz cpu: cortex-a8 image_additional_mb: 1024 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: orangepi5pro - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.4/photonvision_opi5pro.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_opi5pro.img.xz cpu: cortex-a8 image_additional_mb: 1024 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: orangepi5max - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.4/photonvision_opi5max.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_opi5max.img.xz cpu: cortex-a8 image_additional_mb: 1024 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: rock5c - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2025.0.4/photonvision_rock5c.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_rock5c.img.xz cpu: cortex-a8 image_additional_mb: 1024 From fdf9790440867a756a1a155f3e75c82238cd1fee Mon Sep 17 00:00:00 2001 From: Gold856 <117957790+Gold856@users.noreply.github.com> Date: Wed, 8 Oct 2025 23:22:56 -0400 Subject: [PATCH 2/2] Use environment variable and shell expansion --- .github/workflows/build.yml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d36d86709d..6f1d77031a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,6 +9,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} cancel-in-progress: true +env: + IMAGE_VERSION: v2025.0.4 + jobs: validation: @@ -376,7 +379,7 @@ jobs: - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: RaspberryPi - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_raspi.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/$IMAGE_VERSION/photonvision_raspi.img.xz cpu: cortex-a7 image_additional_mb: 0 extraOpts: -Djdk.lang.Process.launchMechanism=vfork @@ -406,7 +409,7 @@ jobs: build-image: needs: [build-package] - # if: ${{ github.event_name != 'pull_request' }} + if: ${{ github.event_name != 'pull_request' }} strategy: fail-fast: false @@ -415,72 +418,72 @@ jobs: - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: RaspberryPi - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_raspi.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/$IMAGE_VERSION/photonvision_raspi.img.xz cpu: cortex-a7 image_additional_mb: 0 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: limelight2 - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_limelight.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/$IMAGE_VERSION/photonvision_limelight.img.xz cpu: cortex-a7 image_additional_mb: 0 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: limelight3 - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_limelight3.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/$IMAGE_VERSION/photonvision_limelight3.img.xz cpu: cortex-a7 image_additional_mb: 0 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: limelight3G - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_limelight3g.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/$IMAGE_VERSION/photonvision_limelight3g.img.xz cpu: cortex-a7 image_additional_mb: 0 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: limelight4 - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_limelight4.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/$IMAGE_VERSION/photonvision_limelight4.img.xz cpu: cortex-a76 image_additional_mb: 0 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: orangepi5 - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_opi5.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/$IMAGE_VERSION/photonvision_opi5.img.xz cpu: cortex-a8 image_additional_mb: 1024 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: orangepi5b - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_opi5b.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/$IMAGE_VERSION/photonvision_opi5b.img.xz cpu: cortex-a8 image_additional_mb: 1024 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: orangepi5plus - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_opi5plus.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/$IMAGE_VERSION/photonvision_opi5plus.img.xz cpu: cortex-a8 image_additional_mb: 1024 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: orangepi5pro - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_opi5pro.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/$IMAGE_VERSION/photonvision_opi5pro.img.xz cpu: cortex-a8 image_additional_mb: 1024 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: orangepi5max - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_opi5max.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/$IMAGE_VERSION/photonvision_opi5max.img.xz cpu: cortex-a8 image_additional_mb: 1024 - os: ubuntu-24.04 artifact-name: LinuxArm64 image_suffix: rock5c - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/${{ vars.IMAGE_VERSION }}/photonvision_rock5c.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/$IMAGE_VERSION/photonvision_rock5c.img.xz cpu: cortex-a8 image_additional_mb: 1024 runs-on: ${{ matrix.os }} - name: "Build image - ${{ matrix.image_url }}" + name: "Build image - ${{ matrix.image_suffix }}" steps: - name: Checkout code