From c6c59f55636a63985f09235482980bb663772f4b Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 28 Dec 2023 08:46:15 -0800 Subject: [PATCH 1/7] Update build.yml --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 58d2356305..e624a1ab0f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -269,11 +269,11 @@ jobs: - os: ubuntu-latest artifact-name: LinuxArm64 image_suffix: RaspberryPi - image_url: https://api.github.com/repos/photonvision/photon-pi-gen/releases/tags/v2023.1.3_arm64 + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.2/photonvision_raspi.img.xz - os: ubuntu-latest artifact-name: LinuxArm64 image_suffix: limelight2 - image_url: https://api.github.com/repos/photonvision/photon-pi-gen/releases/tags/v2023.2.2_limelight-arm64 + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.2/photonvision_limelight.img.xz runs-on: ${{ matrix.os }} name: "Build image - ${{ matrix.image_url }}" @@ -286,6 +286,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: jar-${{ matrix.artifact-name }} + # TODO- replace with the arm-runner action and run this inside of the chroot. but this works for now. - name: Generate image run: | chmod +x scripts/generatePiImage.sh From d829726c60c71d2beba48104cf982ac3aa432ef1 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 29 Dec 2023 01:03:31 -0500 Subject: [PATCH 2/7] Update build.yml --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e624a1ab0f..39ad10fcb5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -269,11 +269,15 @@ jobs: - os: ubuntu-latest artifact-name: LinuxArm64 image_suffix: RaspberryPi - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.2/photonvision_raspi.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.3/photonvision_raspi.img.xz - os: ubuntu-latest artifact-name: LinuxArm64 image_suffix: limelight2 - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.2/photonvision_limelight.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.3/photonvision_limelight.img.xz + - os: ubuntu-latest + artifact-name: LinuxArm64 + image_suffix: orangepi5 + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.3/photonvision_opi5.img.xz runs-on: ${{ matrix.os }} name: "Build image - ${{ matrix.image_url }}" From 7f93e34096ed348ea1fe17aa4f1b0047160af008 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 1 Jan 2024 06:27:58 -0700 Subject: [PATCH 3/7] Fix download url --- .github/workflows/build.yml | 4 +++- scripts/generatePiImage.sh | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 39ad10fcb5..c255ca816d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -261,7 +261,9 @@ jobs: build-image: needs: [build-package] - if: ${{ github.event_name != 'pull_request' }} + # Commented out for testing + # if: ${{ github.event_name != 'pull_request' }} + strategy: fail-fast: false matrix: diff --git a/scripts/generatePiImage.sh b/scripts/generatePiImage.sh index 813b4bbd40..2af278490f 100755 --- a/scripts/generatePiImage.sh +++ b/scripts/generatePiImage.sh @@ -10,9 +10,9 @@ NEW_JAR=$(realpath $(find . -name photonvision\*-linuxarm64.jar)) echo "Using jar: " $NEW_JAR echo "Downloading image from" $1 sudo apt-get install -y xz-utils -curl -sk $1 | grep "browser_download_url.*xz" | cut -d : -f 2,3 | tr -d '"' | wget -qi - +wget $1 ls -FILE_NAME=$(ls | grep image_*.xz) +FILE_NAME=$(ls | grep *.xz) if [ -z "$FILE_NAME" ] then From c20a510578b0e0f4f8478926e30a83b823060331 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 1 Jan 2024 06:33:54 -0700 Subject: [PATCH 4/7] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c255ca816d..2cd19ff3ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -262,7 +262,7 @@ jobs: needs: [build-package] # Commented out for testing - # if: ${{ github.event_name != 'pull_request' }} + # if: ${{ github.event_name != 'pull_request' }} strategy: fail-fast: false From 068bc701a552838fc5ccba68ac27b21988cb7cd4 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 1 Jan 2024 06:40:02 -0700 Subject: [PATCH 5/7] Update generatePiImage.sh --- scripts/generatePiImage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generatePiImage.sh b/scripts/generatePiImage.sh index 2af278490f..b068a2ea48 100755 --- a/scripts/generatePiImage.sh +++ b/scripts/generatePiImage.sh @@ -10,7 +10,7 @@ NEW_JAR=$(realpath $(find . -name photonvision\*-linuxarm64.jar)) echo "Using jar: " $NEW_JAR echo "Downloading image from" $1 sudo apt-get install -y xz-utils -wget $1 +wget -q $1 ls FILE_NAME=$(ls | grep *.xz) From ae9a6fe796c6fc5691f31639fb9700eb0f36a764 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 2 Jan 2024 19:54:40 -0700 Subject: [PATCH 6/7] Update build.yml --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2cd19ff3ca..074f5324af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -261,8 +261,7 @@ jobs: build-image: needs: [build-package] - # Commented out for testing - # if: ${{ github.event_name != 'pull_request' }} + if: ${{ github.event_name != 'pull_request' }} strategy: fail-fast: false From 3e761c5aaab1a84aac29f7def4d2a2be3b3b8cd0 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 3 Jan 2024 14:55:46 -0500 Subject: [PATCH 7/7] Bump base image to include mrcal --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 074f5324af..31179fd867 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -270,15 +270,15 @@ jobs: - os: ubuntu-latest artifact-name: LinuxArm64 image_suffix: RaspberryPi - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.3/photonvision_raspi.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.4/photonvision_raspi.img.xz - os: ubuntu-latest artifact-name: LinuxArm64 image_suffix: limelight2 - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.3/photonvision_limelight.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.4/photonvision_limelight.img.xz - os: ubuntu-latest artifact-name: LinuxArm64 image_suffix: orangepi5 - image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.3/photonvision_opi5.img.xz + image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/v2024.0.4/photonvision_opi5.img.xz runs-on: ${{ matrix.os }} name: "Build image - ${{ matrix.image_url }}"