From 4206cfb0206776d248811691ad9b681986960e85 Mon Sep 17 00:00:00 2001
From: Stephan Wendel <me@stephanwe.de>
Date: Mon, 19 Feb 2024 21:36:13 +0100
Subject: [PATCH] chore: update workflow_config.yml

Signed-off-by: Stephan Wendel <me@stephanwe.de>
---
 .github/actions/build/action.yml | 18 ++++++++----------
 .github/workflow_config.yml      |  4 ++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index 445327704..32f34b8f9 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -47,17 +47,13 @@ runs:
         IFS='/' read -r -a array <<< "${{ inputs.config }}"
         TYPE="${array[0]}"
         SBC="${array[1]}"
-        echo "TYPE=${TYPE}" | tee -a "$GITHUB_OUTPUT"
-        echo "SBC=${SBC}" | tee -a "$GITHUB_OUTPUT"
+        echo "TYPE=${TYPE}" >> "$GITHUB_OUTPUT"
+        echo "SBC=${SBC}" >> "$GITHUB_OUTPUT"
         if [[ "${TYPE}" = "raspberry" ]]; then
           TYPE_CONFIG="rpi-defaults.conf"
         else
           TYPE_CONFIG="${TYPE}-defaults.conf"
         fi
-        echo "DEBUG: TYPE_CONFIG=$TYPE_CONFIG"
-        BOARD_CONFIG=${SBC}.conf
-        echo "DEBUG: BOARD_CONFIG=${SBC}.conf"
-        echo "::endgroup::"
 
         echo "::group::Generate CustomPIOS config file"
         CONFIG_BASE_DIR="./repository/config"
@@ -111,9 +107,8 @@ runs:
 
           echo "::group::Generate Step output"
           source "${CONFIG_PATH}"
-          echo "DEBUG:"
-          echo "DOWNLOAD_URL_CHECKSUM=${DOWNLOAD_URL_CHECKSUM}" | tee -a "$GITHUB_OUTPUT"
-          echo "DOWNLOAD_URL_IMAGE=${DOWNLOAD_URL_IMAGE}" | tee -a "$GITHUB_OUTPUT"
+          echo "DOWNLOAD_URL_CHECKSUM=${DOWNLOAD_URL_CHECKSUM}" >> "$GITHUB_OUTPUT"
+          echo "DOWNLOAD_URL_IMAGE=${DOWNLOAD_URL_IMAGE}" >> "$GITHUB_OUTPUT"
           echo "::endgroup::"
           if [[ "${TYPE}" != "raspberry" ]]; then
             base_zip_img_helper
@@ -131,6 +126,7 @@ runs:
       id: checksum
       shell: bash
       run: |
+        echo "::group::Get base image checksum"
         cd repository/src/image
         FILENAME=$(basename ${{ steps.config.outputs.DOWNLOAD_URL_CHECKSUM }})
         wget -O ${FILENAME} ${{ steps.config.outputs.DOWNLOAD_URL_CHECKSUM }}
@@ -139,6 +135,7 @@ runs:
 
         echo "CHECKSUM=${CHECKSUM}" >> $GITHUB_OUTPUT
         echo "FILENAME=${FILENAME}" >> $GITHUB_OUTPUT
+        echo "::endgroup::"
 
     - name: Cache Base Source Image
       id: cache
@@ -171,7 +168,8 @@ runs:
 
     - name: Build Image
       shell: bash
-      run: sudo modprobe loop && cd repository/src && sudo bash -x ./build_dist
+      run: |
+        sudo modprobe loop && cd repository/src && sudo bash -x ./build_dist
 
     - name: Cleanup workspace & fix permissions
       if: success()
diff --git a/.github/workflow_config.yml b/.github/workflow_config.yml
index c0e72d09a..64b2caab1 100644
--- a/.github/workflow_config.yml
+++ b/.github/workflow_config.yml
@@ -37,5 +37,5 @@ release:
   # Orange Pi OS based images
   - orangepi/orangepi_zero2
   # Raspberry Pi OS based images
-  - raspberry/rpi32
-  - raspberry/rpi64
+  - raspberry/rpi-32bit
+  - raspberry/rpi-64bit