From c92fbfff5de8488629a1adea36d896e48dcb415e Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Sat, 8 Feb 2025 21:51:27 +0100
Subject: [PATCH 01/15] Build RPi jobs using arm-based runners

---
 .github/scripts/build.sh    | 3 ++-
 .github/workflows/qt5_6.yml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh
index 7c917fda..e0f5e4b1 100755
--- a/.github/scripts/build.sh
+++ b/.github/scripts/build.sh
@@ -3,6 +3,7 @@
 # set environment variables if not exists
 [ -z "${BUILD_TYPE}" ] && BUILD_TYPE="Debug"
 [ -z "${TARGET_ARCH}" ] && TARGET_ARCH="linux/amd64"
+[ -z "${ENTRYPOINT}" ] && ENTRYPOINT=""
 [ -z "${PLATFORM}" ] && PLATFORM="x11"
 
 # Determine cmake build type; tag builds are Release, else Debug (-dev appends to platform)
@@ -39,7 +40,7 @@ elif [[ "$RUNNER_OS" == 'Linux' ]]; then
 	mkdir ${GITHUB_WORKSPACE}/deploy
 
 	# run docker
-	docker run --rm --platform=${TARGET_ARCH} \
+	docker run --rm --platform=${TARGET_ARCH} ${ENTRYPOINT} \
 		-v "${GITHUB_WORKSPACE}/deploy:/deploy" \
 		-v "${GITHUB_WORKSPACE}:/source:rw" \
 		$REGISTRY_URL:$DOCKER_TAG \
diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index 1a714a4c..b8a01596 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -36,7 +36,7 @@ jobs:
 
   Linux:
     name: 🐧 ${{ matrix.os.description }}
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.os.architecture[0] == 'amd64' && 'ubuntu-22.04' || 'ubuntu-22.04-arm' }}
     strategy:
       fail-fast: false
       matrix:
@@ -80,6 +80,7 @@ jobs:
           DOCKER_IMAGE: ${{ matrix.os.distribution }}
           DOCKER_TAG: ${{ matrix.os.codename }}${{ inputs.qt_version == '6' && '-qt6' || '' }}
           PLATFORM: ${{ matrix.os.platform }}
+          ENTRYPOINT: ${{ matrix.os.architecture[0] == 'amd64' && '--entrypoint /usr/bin/env' || '' }}
           TARGET_ARCH: ${{ matrix.os.architecture[1] }}
 
       - name: 📦 Upload

From 533342852a131d8b8ca88880933c0f77b15bb464 Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Sat, 8 Feb 2025 21:56:50 +0100
Subject: [PATCH 02/15] typo

---
 .github/workflows/qt5_6.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index b8a01596..acd140e4 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -80,7 +80,7 @@ jobs:
           DOCKER_IMAGE: ${{ matrix.os.distribution }}
           DOCKER_TAG: ${{ matrix.os.codename }}${{ inputs.qt_version == '6' && '-qt6' || '' }}
           PLATFORM: ${{ matrix.os.platform }}
-          ENTRYPOINT: ${{ matrix.os.architecture[0] == 'amd64' && '--entrypoint /usr/bin/env' || '' }}
+          ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }}
           TARGET_ARCH: ${{ matrix.os.architecture[1] }}
 
       - name: 📦 Upload

From ca3975f7bb762ca38c2b2c7c30056635517df398 Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Sun, 9 Feb 2025 13:04:17 +0100
Subject: [PATCH 03/15] Use QEMU (Raspberry Pi only)

---
 .github/workflows/qt5_6.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index acd140e4..607e4ca0 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -73,6 +73,10 @@ jobs:
             fi
           echo '::endgroup::'
 
+      - name: 🛠️ Set up QEMU (Raspberry Pi only)
+        if: matrix.os.platform == 'rpi'
+        uses: docker/setup-qemu-action@v3
+
       - name: 👷 Build
         shell: bash
         run: ./.github/scripts/build.sh
@@ -121,11 +125,6 @@ jobs:
             brew install qt@${{ inputs.qt_version }} vulkan-headers ninja libftdi || true
           echo '::endgroup::'
 
-      - name: Temporarily downgrade CMake to 3.28.3 # Please remove if GitHub has updated Cmake (greater than 3.30.0)
-        uses: jwlawson/actions-setup-cmake@v2
-        with:
-          cmake-version: '3.28.3'
-
       - name: 👷 Build
         shell: bash
         run: ./.github/scripts/build.sh

From 74a18258c1c8802bae99843f0d6e070df592511e Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Sun, 9 Feb 2025 13:12:31 +0100
Subject: [PATCH 04/15] test without entrypoint

---
 .github/workflows/qt5_6.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index 607e4ca0..3faed3b8 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -84,7 +84,7 @@ jobs:
           DOCKER_IMAGE: ${{ matrix.os.distribution }}
           DOCKER_TAG: ${{ matrix.os.codename }}${{ inputs.qt_version == '6' && '-qt6' || '' }}
           PLATFORM: ${{ matrix.os.platform }}
-          ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }}
+          # ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }}
           TARGET_ARCH: ${{ matrix.os.architecture[1] }}
 
       - name: 📦 Upload

From 71352948ea690fad005668864619dd5262cf12fe Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Sun, 9 Feb 2025 14:14:27 +0100
Subject: [PATCH 05/15] set CMAKE_SYSTEM_PROCESSOR

---
 .github/scripts/build.sh    | 3 ++-
 .github/workflows/qt5_6.yml | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh
index e0f5e4b1..6e212475 100755
--- a/.github/scripts/build.sh
+++ b/.github/scripts/build.sh
@@ -5,6 +5,7 @@
 [ -z "${TARGET_ARCH}" ] && TARGET_ARCH="linux/amd64"
 [ -z "${ENTRYPOINT}" ] && ENTRYPOINT=""
 [ -z "${PLATFORM}" ] && PLATFORM="x11"
+[ -z "${CMAKE_SYSTEM_PROCESSOR}" ] && CMAKE_SYSTEM_PROCESSOR=""
 
 # Determine cmake build type; tag builds are Release, else Debug (-dev appends to platform)
 if [[ $GITHUB_REF == *"refs/tags"* ]]; then
@@ -45,7 +46,7 @@ elif [[ "$RUNNER_OS" == 'Linux' ]]; then
 		-v "${GITHUB_WORKSPACE}:/source:rw" \
 		$REGISTRY_URL:$DOCKER_TAG \
 		/bin/bash -c "mkdir -p /source/build && cd /source/build &&
-		cmake -G Ninja -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} .. || exit 2 &&
+		cmake -G Ninja -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${CMAKE_SYSTEM_PROCESSOR} .. || exit 2 &&
 		cmake --build . --target package -- -j $(nproc) || exit 3 || : &&
 		cp /source/build/bin/h* /deploy/ 2>/dev/null || : &&
 		cp /source/build/Hyperion-* /deploy/ 2>/dev/null || : &&
diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index 3faed3b8..c15a2c72 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -49,6 +49,7 @@ jobs:
           { distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 2),              architecture: [ armv7, linux/arm/v7 ], platform: rpi },
           { distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 3/4/5 & Zero 2), architecture: [ arm64, linux/arm64  ], platform: rpi }
         ]
+        target_lookup: [{ 'arm64': 'arm64', 'armv6': 'armv6l', 'armv7': 'armv7l' }]
         isQt5:
           - ${{ inputs.qt_version == '5' }}
         exclude:
@@ -73,10 +74,6 @@ jobs:
             fi
           echo '::endgroup::'
 
-      - name: 🛠️ Set up QEMU (Raspberry Pi only)
-        if: matrix.os.platform == 'rpi'
-        uses: docker/setup-qemu-action@v3
-
       - name: 👷 Build
         shell: bash
         run: ./.github/scripts/build.sh
@@ -84,7 +81,8 @@ jobs:
           DOCKER_IMAGE: ${{ matrix.os.distribution }}
           DOCKER_TAG: ${{ matrix.os.codename }}${{ inputs.qt_version == '6' && '-qt6' || '' }}
           PLATFORM: ${{ matrix.os.platform }}
-          # ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }}
+          ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }}
+          CMAKE_SYSTEM_PROCESSOR: ${{ matrix.os.architecture[0] != 'amd64' && format('-DCMAKE_SYSTEM_PROCESSOR={0}', matrix.target_lookup[format('{0}', matrix.os.architecture[0])]) || '' }}
           TARGET_ARCH: ${{ matrix.os.architecture[1] }}
 
       - name: 📦 Upload

From ed8c6173d22b866457f83b6d091c079f8b89cc1d Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Sun, 9 Feb 2025 14:51:11 +0100
Subject: [PATCH 06/15] set CMAKE_SYSTEM_PROCESSOR to var for cpack

---
 cmake/packages.cmake | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cmake/packages.cmake b/cmake/packages.cmake
index a6701545..648f5591 100644
--- a/cmake/packages.cmake
+++ b/cmake/packages.cmake
@@ -30,10 +30,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     endif()
 endif()
 
-# Overwrite CMAKE_SYSTEM_PROCESSOR for Windows (visual)
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
+set(CPACK_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
+
+# Overwrite CPACK_SYSTEM_PROCESSOR for Windows (visual)
+if(${CPACK_SYSTEM_PROCESSOR} MATCHES "AMD64")
     if(${CMAKE_HOST_WIN32})
-        set(CMAKE_SYSTEM_PROCESSOR "x64")
+        set(CPACK_SYSTEM_PROCESSOR "x64")
     endif()
 endif()
 
@@ -46,7 +48,7 @@ SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md" )
 
 # Replease "+", as cmake/rpm has an issue if "+" occurs in CPACK_PACKAGE_VERSION
 string(REPLACE "+" "." HYPERION_PACKAGE_VERSION ${HYPERION_VERSION})
-SET ( CPACK_PACKAGE_FILE_NAME "Hyperion-${HYPERION_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
+SET ( CPACK_PACKAGE_FILE_NAME "Hyperion-${HYPERION_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CPACK_SYSTEM_PROCESSOR}")
 
 SET ( CPACK_PACKAGE_CONTACT "packages@hyperion-project.org")
 SET ( CPACK_PACKAGE_VENDOR "hyperion-project")

From 32d96585896ad69fc2b0808f7b0ecce3dc7a0178 Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Sun, 9 Feb 2025 15:08:34 +0100
Subject: [PATCH 07/15] CPACK_SYSTEM_PROCESSOR

---
 .github/scripts/build.sh    |  4 ++--
 .github/workflows/qt5_6.yml |  2 +-
 cmake/packages.cmake        | 15 +++++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh
index 6e212475..24e7c6c0 100755
--- a/.github/scripts/build.sh
+++ b/.github/scripts/build.sh
@@ -5,7 +5,7 @@
 [ -z "${TARGET_ARCH}" ] && TARGET_ARCH="linux/amd64"
 [ -z "${ENTRYPOINT}" ] && ENTRYPOINT=""
 [ -z "${PLATFORM}" ] && PLATFORM="x11"
-[ -z "${CMAKE_SYSTEM_PROCESSOR}" ] && CMAKE_SYSTEM_PROCESSOR=""
+[ -z "${CPACK_SYSTEM_PROCESSOR}" ] && CPACK_SYSTEM_PROCESSOR=""
 
 # Determine cmake build type; tag builds are Release, else Debug (-dev appends to platform)
 if [[ $GITHUB_REF == *"refs/tags"* ]]; then
@@ -46,7 +46,7 @@ elif [[ "$RUNNER_OS" == 'Linux' ]]; then
 		-v "${GITHUB_WORKSPACE}:/source:rw" \
 		$REGISTRY_URL:$DOCKER_TAG \
 		/bin/bash -c "mkdir -p /source/build && cd /source/build &&
-		cmake -G Ninja -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${CMAKE_SYSTEM_PROCESSOR} .. || exit 2 &&
+		cmake -G Ninja -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${CPACK_SYSTEM_PROCESSOR} .. || exit 2 &&
 		cmake --build . --target package -- -j $(nproc) || exit 3 || : &&
 		cp /source/build/bin/h* /deploy/ 2>/dev/null || : &&
 		cp /source/build/Hyperion-* /deploy/ 2>/dev/null || : &&
diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index c15a2c72..2ec66d11 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -82,7 +82,7 @@ jobs:
           DOCKER_TAG: ${{ matrix.os.codename }}${{ inputs.qt_version == '6' && '-qt6' || '' }}
           PLATFORM: ${{ matrix.os.platform }}
           ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }}
-          CMAKE_SYSTEM_PROCESSOR: ${{ matrix.os.architecture[0] != 'amd64' && format('-DCMAKE_SYSTEM_PROCESSOR={0}', matrix.target_lookup[format('{0}', matrix.os.architecture[0])]) || '' }}
+          CPACK_SYSTEM_PROCESSOR: ${{ matrix.os.architecture[0] != 'amd64' && format('-DCPACK_SYSTEM_PROCESSOR={0}', matrix.target_lookup[format('{0}', matrix.os.architecture[0])]) || '' }}
           TARGET_ARCH: ${{ matrix.os.architecture[1] }}
 
       - name: 📦 Upload
diff --git a/cmake/packages.cmake b/cmake/packages.cmake
index 648f5591..16f77916 100644
--- a/cmake/packages.cmake
+++ b/cmake/packages.cmake
@@ -23,6 +23,11 @@ IF(DEB_BUILDER_FOUND)
 	SET ( CPACK_GENERATOR ${CPACK_GENERATOR} "DEB")
 ENDIF()
 
+# Parameter CPACK_SYSTEM_PROCESSOR overwrites CMAKE_SYSTEM_PROCESSOR
+if(CPACK_SYSTEM_PROCESSOR)
+	set(CMAKE_SYSTEM_PROCESSOR ${CPACK_SYSTEM_PROCESSOR})
+endif()
+
 # Overwrite CMAKE_SYSTEM_NAME for mac (visual)
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     if(${CMAKE_HOST_APPLE})
@@ -30,12 +35,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     endif()
 endif()
 
-set(CPACK_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
-
-# Overwrite CPACK_SYSTEM_PROCESSOR for Windows (visual)
-if(${CPACK_SYSTEM_PROCESSOR} MATCHES "AMD64")
+# Overwrite CMAKE_SYSTEM_PROCESSOR for Windows (visual)
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
     if(${CMAKE_HOST_WIN32})
-        set(CPACK_SYSTEM_PROCESSOR "x64")
+        set(CMAKE_SYSTEM_PROCESSOR "x64")
     endif()
 endif()
 
@@ -48,7 +51,7 @@ SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md" )
 
 # Replease "+", as cmake/rpm has an issue if "+" occurs in CPACK_PACKAGE_VERSION
 string(REPLACE "+" "." HYPERION_PACKAGE_VERSION ${HYPERION_VERSION})
-SET ( CPACK_PACKAGE_FILE_NAME "Hyperion-${HYPERION_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CPACK_SYSTEM_PROCESSOR}")
+SET ( CPACK_PACKAGE_FILE_NAME "Hyperion-${HYPERION_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
 
 SET ( CPACK_PACKAGE_CONTACT "packages@hyperion-project.org")
 SET ( CPACK_PACKAGE_VENDOR "hyperion-project")

From 78bd778222ee18b93035e13233058ff566cce4c9 Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Sun, 9 Feb 2025 15:33:18 +0100
Subject: [PATCH 08/15] add macos matrix

---
 .github/workflows/qt5_6.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index 2ec66d11..4a63fd6a 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -99,8 +99,13 @@ jobs:
 ######################
 
   macOS:
-    name: 🍏 macOS x64
-    runs-on: macos-latest
+    name: 🍏 macOS ${{ matrix.architecture }}
+    runs-on: ${{ matrix.architecture == 'arm64' && 'macos-14' || 'macos-13' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        architecture: [ arm64, x64 ]
+
     steps:
       - name: ⬇ Checkout
         uses: actions/checkout@v4
@@ -136,7 +141,7 @@ jobs:
           name: ${{ inputs.event_name == 'pull_request' && env.NAME || format('artifact-{0}', env.NAME) }}
           path: 'build/Hyperion-*'
         env:
-          NAME: ${{ inputs.qt_version == '6' && 'macOS_x64_qt6' || 'macOS_x64' }}
+          NAME: ${{ inputs.qt_version == '6' && format('macOS_{0}_qt6', matrix.architecture) || format('macOS_{0}', matrix.architecture) }}
 
 ######################
 ###### Windows #######

From 789d62bdae355f982ff964da5acf1f38d93b9f8d Mon Sep 17 00:00:00 2001
From: LordGrey <lordgrey.emmel@gmail.com>
Date: Fri, 14 Feb 2025 18:08:48 +0100
Subject: [PATCH 09/15] Correct docker_compile.sh

---
 bin/scripts/docker-compile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/scripts/docker-compile.sh b/bin/scripts/docker-compile.sh
index 96f6abed..fa34bd06 100755
--- a/bin/scripts/docker-compile.sh
+++ b/bin/scripts/docker-compile.sh
@@ -200,7 +200,7 @@ if [ ${CURRENT_ARCHITECTURE} == "aarch64" ]; then
 		   USER_ARCHITECTURE="arm/v6"
 	   fi
 	fi
-    if [ $ARCHITECTURE != $USER_ARCHITECTURE ]; then
+    if [ $CURRENT_ARCHITECTURE != $USER_ARCHITECTURE ]; then
         log "Identified user space current architecture: $USER_ARCHITECTURE"
         CURRENT_ARCHITECTURE=$USER_ARCHITECTURE
     fi

From 8bd9ed53afd20ba49b6cf9428da3bf3a84bb3460 Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Sat, 15 Feb 2025 20:11:14 +0100
Subject: [PATCH 10/15] brew update/upgrade on macos

---
 .github/workflows/qt5_6.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index 4a63fd6a..07716f2b 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -123,8 +123,7 @@ jobs:
           echo '::endgroup::'
 
           echo '::group::Update/Install dependencies'
-            brew untap --force homebrew/core homebrew/cask
-            brew update || true
+            brew update && brew upgrade || true
             brew install qt@${{ inputs.qt_version }} vulkan-headers ninja libftdi || true
           echo '::endgroup::'
 

From 56fb8525b49e60cefad456eadbf64a07d18df48f Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Fri, 21 Feb 2025 19:31:31 +0100
Subject: [PATCH 11/15] ARM Runner issues should be resolved
 https://github.com/orgs/community/discussions/148648#discussioncomment-12205917

---
 .github/workflows/qt5_6.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index 07716f2b..8d8e2695 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -36,7 +36,7 @@ jobs:
 
   Linux:
     name: 🐧 ${{ matrix.os.description }}
-    runs-on: ${{ matrix.os.architecture[0] == 'amd64' && 'ubuntu-22.04' || 'ubuntu-22.04-arm' }}
+    runs-on: ${{ matrix.os.architecture[0] == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
     strategy:
       fail-fast: false
       matrix:

From 66371034c8395d1ed23983dc0d03098e8ecc4147 Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Sat, 22 Feb 2025 09:10:42 +0100
Subject: [PATCH 12/15] remove build bash script

---
 .github/scripts/build.sh    | 59 -------------------------
 .github/workflows/qt5_6.yml | 85 +++++++++++++++++++++++--------------
 2 files changed, 53 insertions(+), 91 deletions(-)
 delete mode 100755 .github/scripts/build.sh

diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh
deleted file mode 100755
index 24e7c6c0..00000000
--- a/.github/scripts/build.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-# set environment variables if not exists
-[ -z "${BUILD_TYPE}" ] && BUILD_TYPE="Debug"
-[ -z "${TARGET_ARCH}" ] && TARGET_ARCH="linux/amd64"
-[ -z "${ENTRYPOINT}" ] && ENTRYPOINT=""
-[ -z "${PLATFORM}" ] && PLATFORM="x11"
-[ -z "${CPACK_SYSTEM_PROCESSOR}" ] && CPACK_SYSTEM_PROCESSOR=""
-
-# Determine cmake build type; tag builds are Release, else Debug (-dev appends to platform)
-if [[ $GITHUB_REF == *"refs/tags"* ]]; then
-	BUILD_TYPE=Release
-else
-	PLATFORM=${PLATFORM}-dev
-fi
-
-echo "Compile Hyperion on '${RUNNER_OS}' with build type '${BUILD_TYPE}' and platform '${PLATFORM}'"
-
-# Build the package on MacOS, Windows or Linux
-if [[ "$RUNNER_OS" == 'macOS' ]]; then
-	mkdir build || exit 1
-	cmake -B build -G Ninja -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=/usr/local || exit 2
-	cmake --build build --target package --parallel $(sysctl -n hw.ncpu) || exit 3
-	cd ${GITHUB_WORKSPACE} && source /${GITHUB_WORKSPACE}/test/testrunner.sh || exit 4
-	exit 0;
-	exit 1 || { echo "---> Hyperion compilation failed! Abort"; exit 5; }
-elif [[ $RUNNER_OS == "Windows" ]]; then
-	echo "Number of Cores $NUMBER_OF_PROCESSORS"
-	mkdir build || exit 1
-	cd build
-	cmake -G "Visual Studio 17 2022" -A x64 -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE="Release" ../ || exit 2
-	cmake --build . --target package --config "Release" -- -nologo -v:m -maxcpucount || exit 3
-	exit 0;
-	exit 1 || { echo "---> Hyperion compilation failed! Abort"; exit 5; }
-elif [[ "$RUNNER_OS" == 'Linux' ]]; then
-	echo "Docker arguments used: DOCKER_IMAGE=${DOCKER_IMAGE}, DOCKER_TAG=${DOCKER_TAG}, TARGET_ARCH=${TARGET_ARCH}"
-	# verification bypass of external dependencies
-	# set GitHub Container Registry url
-	REGISTRY_URL="ghcr.io/hyperion-project/${DOCKER_IMAGE}"
-	# take ownership of deploy dir
-	mkdir ${GITHUB_WORKSPACE}/deploy
-
-	# run docker
-	docker run --rm --platform=${TARGET_ARCH} ${ENTRYPOINT} \
-		-v "${GITHUB_WORKSPACE}/deploy:/deploy" \
-		-v "${GITHUB_WORKSPACE}:/source:rw" \
-		$REGISTRY_URL:$DOCKER_TAG \
-		/bin/bash -c "mkdir -p /source/build && cd /source/build &&
-		cmake -G Ninja -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${CPACK_SYSTEM_PROCESSOR} .. || exit 2 &&
-		cmake --build . --target package -- -j $(nproc) || exit 3 || : &&
-		cp /source/build/bin/h* /deploy/ 2>/dev/null || : &&
-		cp /source/build/Hyperion-* /deploy/ 2>/dev/null || : &&
-		cd /source && source /source/test/testrunner.sh || exit 5 &&
-		exit 0;
-		exit 1 " || { echo "---> Hyperion compilation failed! Abort"; exit 5; }
-
-	# overwrite file owner to current user
-	sudo chown -fR $(stat -c "%U:%G" ${GITHUB_WORKSPACE}/deploy) ${GITHUB_WORKSPACE}/deploy
-fi
diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index 8d8e2695..e6655af8 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -25,9 +25,6 @@ on:
         default: false
         required: false
 
-env:
-  ghcr: hyperion-project
-
 jobs:
 
 ######################
@@ -76,14 +73,22 @@ jobs:
 
       - name: 👷 Build
         shell: bash
-        run: ./.github/scripts/build.sh
+        run: |
+          mkdir deploy
+          docker run --rm --platform=${{ matrix.os.architecture[1] }} ${{ env.ENTRYPOINT }} \
+            -v "${{ github.workspace }}/deploy:/deploy" \
+            -v "${{ github.workspace }}:/source:rw" \
+            -w "/source" \
+            ghcr.io/hyperion-project/${{ env.DOCKER_IMAGE }}:${{ env.DOCKER_TAG }} \
+            /bin/bash -c "cmake --preset linux-${{ env.BUILD_TYPE }} -DPLATFORM=${{ matrix.os.platform }} ${{ env.CPACK_SYSTEM_PROCESSOR }} &&
+            cmake --build --preset linux-${{ env.BUILD_TYPE }} --target package --parallel $(nproc) &&
+            cp /source/build/Hyperion-* /deploy/ 2>/dev/null"
         env:
           DOCKER_IMAGE: ${{ matrix.os.distribution }}
           DOCKER_TAG: ${{ matrix.os.codename }}${{ inputs.qt_version == '6' && '-qt6' || '' }}
-          PLATFORM: ${{ matrix.os.platform }}
+          BUILD_TYPE: ${{ inputs.event_name == 'pull_request' && 'debug' || 'release' }}
           ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }}
           CPACK_SYSTEM_PROCESSOR: ${{ matrix.os.architecture[0] != 'amd64' && format('-DCPACK_SYSTEM_PROCESSOR={0}', matrix.target_lookup[format('{0}', matrix.os.architecture[0])]) || '' }}
-          TARGET_ARCH: ${{ matrix.os.architecture[1] }}
 
       - name: 📦 Upload
         if: ${{ inputs.publish || inputs.event_name == 'pull_request' }}
@@ -112,6 +117,22 @@ jobs:
         with:
           submodules: recursive
 
+      - name: 🔧 Append Pull Request number to version (PR  only)
+        if: ${{ inputs.event_name == 'pull_request' }}
+        shell: bash
+        run: tr -d '\n' < .version > temp && mv temp .version && echo -n "+PR${{ inputs.pull_request_number }}" >> .version
+
+      - name: 💾 Restore Homebrew Cache
+        id: cache-homebrew
+        uses: actions/cache@v4
+        with:
+          path: ~/Library/Caches/Homebrew/downloads
+          key: ${{ runner.os }}-homebrew-packages-${{ inputs.qt_version }}
+
+      - name: 📥 Install dependencies
+        shell: bash
+        run: brew update -q && brew install -q qt@${{ inputs.qt_version }} vulkan-headers ninja libftdi || true
+
       - name: 🔧 Prepare
         shell: bash
         run: |
@@ -123,15 +144,17 @@ jobs:
           echo '::endgroup::'
 
           echo '::group::Update/Install dependencies'
-            brew update && brew upgrade || true
-            brew install qt@${{ inputs.qt_version }} vulkan-headers ninja libftdi || true
+            brew update -q && brew install -q qt@${{ inputs.qt_version }} vulkan-headers ninja libftdi || true
           echo '::endgroup::'
 
       - name: 👷 Build
         shell: bash
-        run: ./.github/scripts/build.sh
+        run: |
+          cmake --preset macos-${{ env.BUILD_TYPE }}
+          cmake --build --preset macos-${{ env.BUILD_TYPE }} --parallel $(sysctl -n hw.ncpu)
+          cd build; cpack
         env:
-          PLATFORM: osx
+          BUILD_TYPE: ${{ inputs.event_name == 'pull_request' && 'debug' || 'release' }}
 
       - name: 📦 Upload
         if: ${{ inputs.publish || inputs.event_name == 'pull_request' }}
@@ -151,6 +174,7 @@ jobs:
     runs-on: windows-2022
     env:
       VCINSTALLDIR: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
+      LIBJPEG_TURBO_VERSION: 3.0.1
     steps:
       - name: ⬇ Checkout
         uses: actions/checkout@v4
@@ -160,27 +184,27 @@ jobs:
       - name: 🔧 Prepare PR
         if: ${{ inputs.event_name == 'pull_request' }}
         shell: bash
-        run: |
-          echo '::group::Append PR number to version'
-            tr -d '\n' < .version > temp && mv temp .version
-            echo -n "+PR${{ inputs.pull_request_number }}" >> .version
-          echo '::endgroup::'
+        run: tr -d '\n' < .version > temp && mv temp .version && echo -n "+PR${{ inputs.pull_request_number }}" >> .version
 
-      - name: 💾 Cache/Restore
+      - name: 💾 Restore DirectX SDK & libjpeg-turbo
+        id: cache-windows
         uses: actions/cache@v4
         with:
-          path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
-          key: ${{ runner.os }}${{ '-chocolatey' }}
+          path: ./installer
+          key: ${{ runner.os }}-libjpeg-${{ env.LIBJPEG_TURBO_VERSION }}-dxsdk-jun10
 
-      - name: 📥 Install DirectX SDK, OpenSSL, libjpeg-turbo
+      - name: 📥 Download DirectX SDK & libjpeg-turbo
+        if: steps.cache-windows.outputs.cache-hit != 'true'
         shell: powershell
         run: |
-          choco install --no-progress directx-sdk -y
-          choco install --no-progress ${{env.OPENSSL}} -y
-          Invoke-WebRequest https://netcologne.dl.sourceforge.net/project/libjpeg-turbo/3.0.1/libjpeg-turbo-3.0.1-vc64.exe -OutFile libjpeg-turbo.exe -UserAgent NativeHost
-          .\libjpeg-turbo /S
-        env:
-          OPENSSL: ${{ inputs.qt_version == '6' && 'openssl' || 'openssl --version=1.1.1.2100' }}
+          mkdir .\installer
+          Invoke-WebRequest -Uri https://sourceforge.net/projects/libjpeg-turbo/files/${{ env.LIBJPEG_TURBO_VERSION }}/libjpeg-turbo-${{ env.LIBJPEG_TURBO_VERSION }}-vc64.exe -OutFile ".\installer\libjpeg-turbo.exe" -UserAgent "NativeHost"
+          Invoke-WebRequest -Uri https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe -OutFile ".\installer\dxsdk-jun10.exe" -UserAgent "NativeHost"
+
+      - name: 📥 Install DirectX SDK, libjpeg-turbo
+        run: |
+          cmd.exe /c start /wait .\installer\libjpeg-turbo.exe /S
+          cmd.exe /c start /wait .\installer\dxsdk-jun10.exe /U /F
 
       - name: Install Vulkan SDK
         if: ${{ inputs.qt_version == '6' }}
@@ -203,16 +227,13 @@ jobs:
         shell: cmd
         run: call "${{env.VCINSTALLDIR}}\Auxiliary\Build\vcvars64.bat"
 
-      - name: Temporarily downgrade CMake to 3.28.3 # Please remove if GitHub has updated Cmake (greater than 3.30.0)
-        uses: jwlawson/actions-setup-cmake@v2
-        with:
-          cmake-version: '3.28.3'
-
       - name: 👷 Build
         shell: bash
-        run: ./.github/scripts/build.sh
+        run: |
+           cmake --preset windows-${{ env.BUILD_TYPE }}
+           cmake --build --preset windows-${{ env.BUILD_TYPE }} --target package -- -nologo -v:m -maxcpucount
         env:
-          PLATFORM: windows
+          BUILD_TYPE: ${{ inputs.event_name == 'pull_request' && 'debug' || 'release' }}
 
       - name: 📦 Upload
         if: ${{ inputs.publish || inputs.event_name == 'pull_request' }}

From 5b6b2dc51639bda1d7f8c8e1fe35bd822dcd0ef0 Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Sat, 22 Feb 2025 09:29:07 +0100
Subject: [PATCH 13/15] update workflow

---
 .github/workflows/qt5_6.yml | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index e6655af8..afed8a6c 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -61,15 +61,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: 🔧 Prepare
+      - name: 🔧 Append PR number to version (PR  only)
+        if: ${{ inputs.event_name == 'pull_request' }}
         shell: bash
-        run: |
-          echo '::group::Append PR number to version (PR  only)'
-            if [[ "${{ inputs.event_name }}" = "pull_request" ]]; then
-              tr -d '\n' < .version > temp && mv temp .version
-              echo -n "+PR${{ inputs.pull_request_number }}" >> .version
-            fi
-          echo '::endgroup::'
+        run: tr -d '\n' < .version > temp && mv temp .version && echo -n "+PR${{ inputs.pull_request_number }}" >> .version
 
       - name: 👷 Build
         shell: bash
@@ -127,26 +122,12 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/Library/Caches/Homebrew/downloads
-          key: ${{ runner.os }}-homebrew-packages-${{ inputs.qt_version }}
+          key: ${{ runner.os }}-${{ matrix.architecture }}-homebrew-packages-${{ inputs.qt_version }}
 
       - name: 📥 Install dependencies
         shell: bash
         run: brew update -q && brew install -q qt@${{ inputs.qt_version }} vulkan-headers ninja libftdi || true
 
-      - name: 🔧 Prepare
-        shell: bash
-        run: |
-          echo '::group::Append PR number to version (PR  only)'
-            if [[ "${{ inputs.event_name }}" = "pull_request" ]]; then
-              tr -d '\n' < .version > temp && mv temp .version
-              echo -n "+PR${{ inputs.pull_request_number }}" >> .version
-            fi
-          echo '::endgroup::'
-
-          echo '::group::Update/Install dependencies'
-            brew update -q && brew install -q qt@${{ inputs.qt_version }} vulkan-headers ninja libftdi || true
-          echo '::endgroup::'
-
       - name: 👷 Build
         shell: bash
         run: |
@@ -181,7 +162,7 @@ jobs:
         with:
           submodules: recursive
 
-      - name: 🔧 Prepare PR
+      - name: 🔧 Append Pull Request number to version (PR  only)
         if: ${{ inputs.event_name == 'pull_request' }}
         shell: bash
         run: tr -d '\n' < .version > temp && mv temp .version && echo -n "+PR${{ inputs.pull_request_number }}" >> .version

From 0a6b9547132e5cb553c5167860b9a0a5e7746bc2 Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Sat, 22 Feb 2025 11:26:48 +0100
Subject: [PATCH 14/15] Revert Windows PR build type to release

---
 .github/workflows/qt5_6.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index afed8a6c..169066c7 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -211,10 +211,8 @@ jobs:
       - name: 👷 Build
         shell: bash
         run: |
-           cmake --preset windows-${{ env.BUILD_TYPE }}
-           cmake --build --preset windows-${{ env.BUILD_TYPE }} --target package -- -nologo -v:m -maxcpucount
-        env:
-          BUILD_TYPE: ${{ inputs.event_name == 'pull_request' && 'debug' || 'release' }}
+           cmake --preset windows-release
+           cmake --build --preset windows-release --target package -- -nologo -v:m -maxcpucount
 
       - name: 📦 Upload
         if: ${{ inputs.publish || inputs.event_name == 'pull_request' }}

From 7bd44c28c0f2a983a97f8cd0dc36f27950bc4ae9 Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Mon, 24 Feb 2025 18:19:58 +0100
Subject: [PATCH 15/15] test cached-download-action

---
 .github/workflows/qt5_6.yml | 38 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index 169066c7..61fec80a 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -117,16 +117,11 @@ jobs:
         shell: bash
         run: tr -d '\n' < .version > temp && mv temp .version && echo -n "+PR${{ inputs.pull_request_number }}" >> .version
 
-      - name: 💾 Restore Homebrew Cache
-        id: cache-homebrew
-        uses: actions/cache@v4
-        with:
-          path: ~/Library/Caches/Homebrew/downloads
-          key: ${{ runner.os }}-${{ matrix.architecture }}-homebrew-packages-${{ inputs.qt_version }}
-
       - name: 📥 Install dependencies
-        shell: bash
-        run: brew update -q && brew install -q qt@${{ inputs.qt_version }} vulkan-headers ninja libftdi || true
+        uses: tecolicom/actions-use-homebrew-tools@v1
+        with:
+          tools: qt@${{ inputs.qt_version }} vulkan-headers ninja libftdi
+          key: ${{ runner.os }}-${{ matrix.architecture }}-homebrew-packages-${{ inputs.qt_version }}
 
       - name: 👷 Build
         shell: bash
@@ -167,22 +162,21 @@ jobs:
         shell: bash
         run: tr -d '\n' < .version > temp && mv temp .version && echo -n "+PR${{ inputs.pull_request_number }}" >> .version
 
-      - name: 💾 Restore DirectX SDK & libjpeg-turbo
-        id: cache-windows
-        uses: actions/cache@v4
+      - name: 📥 Download and 💾 Cache DirectX SDK
+        uses: ethanjli/cached-download-action@v0.1.2
         with:
-          path: ./installer
-          key: ${{ runner.os }}-libjpeg-${{ env.LIBJPEG_TURBO_VERSION }}-dxsdk-jun10
+          url: https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe
+          destination: .\installer\dxsdk-jun10.exe
+          cache-key: dxsdk-jun10
 
-      - name: 📥 Download DirectX SDK & libjpeg-turbo
-        if: steps.cache-windows.outputs.cache-hit != 'true'
-        shell: powershell
-        run: |
-          mkdir .\installer
-          Invoke-WebRequest -Uri https://sourceforge.net/projects/libjpeg-turbo/files/${{ env.LIBJPEG_TURBO_VERSION }}/libjpeg-turbo-${{ env.LIBJPEG_TURBO_VERSION }}-vc64.exe -OutFile ".\installer\libjpeg-turbo.exe" -UserAgent "NativeHost"
-          Invoke-WebRequest -Uri https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe -OutFile ".\installer\dxsdk-jun10.exe" -UserAgent "NativeHost"
+      - name: 📥 Download and 💾 Cache libjpeg-turbo
+        uses: ethanjli/cached-download-action@v0.1.2
+        with:
+          url: https://sourceforge.net/projects/libjpeg-turbo/files/${{ env.LIBJPEG_TURBO_VERSION }}/libjpeg-turbo-${{ env.LIBJPEG_TURBO_VERSION }}-vc64.exe
+          destination: .\installer\libjpeg-turbo.exe
+          cache-key: libjpeg-turbo
 
-      - name: 📥 Install DirectX SDK, libjpeg-turbo
+      - name: 📥 Install DirectX SDK & libjpeg-turbo
         run: |
           cmd.exe /c start /wait .\installer\libjpeg-turbo.exe /S
           cmd.exe /c start /wait .\installer\dxsdk-jun10.exe /U /F