From d0c4bb9a63b412484205d42467879338dc3d9d9e Mon Sep 17 00:00:00 2001
From: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
Date: Wed, 11 Oct 2023 18:28:08 -0400
Subject: [PATCH] CI: switch to release bookworm URLs

---
 .github/workflows/test_build.yml  |  8 ++------
 .github/workflows/update_apps.yml | 12 ++++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml
index e2da994dc9..954b92067c 100644
--- a/.github/workflows/test_build.yml
+++ b/.github/workflows/test_build.yml
@@ -123,11 +123,9 @@ jobs:
       - name: Test installing app on bookworm armhf
         uses: theofficialgman/arm-runner-action@v12
         with:
-          base_image: ${{ secrets.RPIOS_BOOKWORM_ARMHF_URL }}
+          base_image: https://downloads.raspberrypi.com/raspios_armhf/images/raspios_armhf-2023-10-10/2023-10-10-raspios-bookworm-armhf.img.xz
           bind_mount_repository: yes
           image_additional_mb: 5000
-          # disable image caching to not leak the URL
-          enable_image_caching: no
           cpu: cortex-a7:cortex-a72
           cpu_info: cpuinfo/raspberrypi_4b
           copy_repository_path: /home/runner/pi-apps
@@ -188,11 +186,9 @@ jobs:
       - name: Test installing app on bookworm arm64
         uses: theofficialgman/arm-runner-action@v12
         with:
-          base_image: ${{ secrets.RPIOS_BOOKWORM_URL }}
+          base_image: https://downloads.raspberrypi.com/raspios_arm64/images/raspios_arm64-2023-10-10/2023-10-10-raspios-bookworm-arm64.img.xz
           bind_mount_repository: yes
           image_additional_mb: 5000
-          # disable image caching to not leak the URL
-          enable_image_caching: no
           cpu: cortex-a7:cortex-a72
           cpu_info: cpuinfo/raspberrypi_4b
           copy_repository_path: /home/runner/pi-apps
diff --git a/.github/workflows/update_apps.yml b/.github/workflows/update_apps.yml
index 488f1131ac..efcae4e0fc 100644
--- a/.github/workflows/update_apps.yml
+++ b/.github/workflows/update_apps.yml
@@ -142,12 +142,12 @@ jobs:
             cache: yes
           - os: bookworm
             arch: armhf
-            image: RPIOS_BOOKWORM_ARMHF_URL
-            cache: no
+            image: https://downloads.raspberrypi.com/raspios_armhf/images/raspios_armhf-2023-10-10/2023-10-10-raspios-bookworm-armhf.img.xz
+            cache: yes
           - os: bookworm
             arch: arm64
-            image: RPIOS_BOOKWORM_URL
-            cache: no
+            image: https://downloads.raspberrypi.com/raspios_arm64/images/raspios_arm64-2023-10-10/2023-10-10-raspios-bookworm-arm64.img.xz
+            cache: yes
     name: Testing on ${{ matrix.os }} - ${{ matrix.arch }}
     outputs:
       FAILED_UPDATE_APPS_buster_armhf: ${{ steps.failed.outputs.FAILED_UPDATE_APPS_buster_armhf || '' }}
@@ -175,14 +175,14 @@ jobs:
           cd $GITHUB_WORKSPACE
 
       - name: Replace secret reference with contents
-        if: ${{ matrix.image == 'RPIOS_BOOKWORM_URL' || matrix.image == 'RPIOS_BOOKWORM_ARMHF_URL' }}
+        if: ${{ matrix.image == 'RPIOS_TRIXIE_URL' || matrix.image == 'RPIOS_TRIXIE_ARMHF_URL' }}
         run: |
           image_url=${{ secrets[matrix.image] }}
           echo "::add-mask::$image_url"
           echo "image_url=$image_url" >> "$GITHUB_ENV"
 
       - name: Replace non-secret reference with contents
-        if: ${{ matrix.image != 'RPIOS_BOOKWORM_URL' && matrix.image != 'RPIOS_BOOKWORM_ARMHF_URL' }}
+        if: ${{ matrix.image != 'RPIOS_TRIXIE_URL' && matrix.image != 'RPIOS_TRIXIE_ARMHF_URL' }}
         run: |
           image_url=${{ matrix.image }}
           echo "image_url=$image_url" >> "$GITHUB_ENV"