From 9712642c34549e146fe684ce19fcbadc9a0a2571 Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Mon, 29 Sep 2025 21:35:31 +0200 Subject: [PATCH 1/8] Update Windows runner to use windows-2025 --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c20dcfedc..5f0dc37e7 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -29,7 +29,7 @@ jobs: windows: name: ${{ matrix.os.description }} - runs-on: ${{ matrix.os.architecture == 'arm64' && 'windows-11-arm' || 'windows-2022' }} + runs-on: ${{ matrix.os.architecture == 'arm64' && 'windows-11-arm' || 'windows-2025' }} strategy: fail-fast: false matrix: From 25b6cc5a3a861ef9703b36e6d4949dc2fdda16c3 Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Mon, 29 Sep 2025 21:51:10 +0200 Subject: [PATCH 2/8] Update Python setup and remove OpenSSL installation Updated Python setup action to version 6 and changed Python version to 3.13.7. Removed OpenSSL installation steps. --- .github/workflows/windows.yml | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5f0dc37e7..3b2854cd0 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -55,9 +55,9 @@ jobs: fi - name: 📥 Install Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: - python-version: '3.13.5' + python-version: '3.13.7' architecture: ${{ matrix.os.architecture }} - name: 📥 Install Qt @@ -80,20 +80,7 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 with: arch: ${{ matrix.os.architecture }} - - - name: 💾 Download OpenSSL 3.x - uses: ethanjli/cached-download-action@v0.1.3 - with: - url: "https://slproweb.com/download/Win64${{ matrix.os.architecture == 'arm64' && 'ARM' || '' }}OpenSSL-3_5_3.exe" - destination: .\installer\openssl.exe - cache-key: OpenSSL - - - name: 📥 Install OpenSSL 3.x - shell: powershell - run: | - Start-Process -FilePath ".\installer\openssl.exe" -ArgumentList "/silent", "/verysilent", "/sp-", "/suppressmsgboxes", "/DIR=C:\OpenSSL" -Wait - echo "OPENSSL_ROOT_DIR=C:\OpenSSL" >> $env:GITHUB_ENV - + - name: 💾 Download Pre-Build Dependencies id: dependencies uses: ./.github/actions/download-pre-built-deps From f5d0bf2ab336eb69d0c92ff837d10e27026b16eb Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Mon, 29 Sep 2025 22:00:34 +0200 Subject: [PATCH 3/8] Add Inno Setup installation step to workflow Added steps to download and install Inno Setup if not already present. --- .github/workflows/windows.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3b2854cd0..3f6520886 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -80,6 +80,35 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 with: arch: ${{ matrix.os.architecture }} + +- name: Download/Install Inno Setup + run: | + echo "Checking pre-installation..." + + set "ISCC_PATH=%programfiles(x86)%\Inno Setup 6\ISCC.exe" + + if exist "%ISCC_PATH%" ( + echo ::warning::Inno Setup is already installed + exit /b 0 + ) + + echo "Downloading Inno Setup..." + + set "_url_=https://jrsoftware.org/download.php/is.exe?site=1" + set "_file_=innosetup.exe" + + curl -L -o "%tmp%\%_file_%" "%_url_%" + + echo "Installing Inno Setup..." + "%tmp%\%_file_%" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- + + if not exist "%ISCC_PATH%" ( + echo "::error::Inno Setup installation failed" + exit 1 + ) + + echo ::warning::Inno Setup installed successfully! + shell: cmd - name: 💾 Download Pre-Build Dependencies id: dependencies From 51b5e321f87fdb171c2d04927b70467852bd3b67 Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Mon, 29 Sep 2025 22:17:34 +0200 Subject: [PATCH 4/8] windows.yml aktualisieren --- .github/workflows/windows.yml | 56 +++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3f6520886..b48632902 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -81,34 +81,34 @@ jobs: with: arch: ${{ matrix.os.architecture }} -- name: Download/Install Inno Setup - run: | - echo "Checking pre-installation..." - - set "ISCC_PATH=%programfiles(x86)%\Inno Setup 6\ISCC.exe" - - if exist "%ISCC_PATH%" ( - echo ::warning::Inno Setup is already installed - exit /b 0 - ) - - echo "Downloading Inno Setup..." - - set "_url_=https://jrsoftware.org/download.php/is.exe?site=1" - set "_file_=innosetup.exe" - - curl -L -o "%tmp%\%_file_%" "%_url_%" - - echo "Installing Inno Setup..." - "%tmp%\%_file_%" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- - - if not exist "%ISCC_PATH%" ( - echo "::error::Inno Setup installation failed" - exit 1 - ) - - echo ::warning::Inno Setup installed successfully! - shell: cmd + - name: Download/Install Inno Setup + run: | + echo "Checking pre-installation..." + + set "ISCC_PATH=%programfiles(x86)%\Inno Setup 6\ISCC.exe" + + if exist "%ISCC_PATH%" ( + echo ::warning::Inno Setup is already installed + exit /b 0 + ) + + echo "Downloading Inno Setup..." + + set "_url_=https://jrsoftware.org/download.php/is.exe?site=1" + set "_file_=innosetup.exe" + + curl -L -o "%tmp%\%_file_%" "%_url_%" + + echo "Installing Inno Setup..." + "%tmp%\%_file_%" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- + + if not exist "%ISCC_PATH%" ( + echo "::error::Inno Setup installation failed" + exit 1 + ) + + echo ::warning::Inno Setup installed successfully! + shell: cmd - name: 💾 Download Pre-Build Dependencies id: dependencies From fdb7c2864edcf13b8578de1b0f2ec1121f31a428 Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Mon, 29 Sep 2025 22:20:06 +0200 Subject: [PATCH 5/8] windows.yml aktualisieren --- .github/workflows/windows.yml | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b48632902..2e48a8f51 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -82,33 +82,33 @@ jobs: arch: ${{ matrix.os.architecture }} - name: Download/Install Inno Setup - run: | - echo "Checking pre-installation..." - - set "ISCC_PATH=%programfiles(x86)%\Inno Setup 6\ISCC.exe" - - if exist "%ISCC_PATH%" ( - echo ::warning::Inno Setup is already installed - exit /b 0 - ) - - echo "Downloading Inno Setup..." - - set "_url_=https://jrsoftware.org/download.php/is.exe?site=1" - set "_file_=innosetup.exe" - - curl -L -o "%tmp%\%_file_%" "%_url_%" - - echo "Installing Inno Setup..." - "%tmp%\%_file_%" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- - - if not exist "%ISCC_PATH%" ( - echo "::error::Inno Setup installation failed" - exit 1 - ) - - echo ::warning::Inno Setup installed successfully! - shell: cmd + run: | + echo "Checking pre-installation..." + + set "ISCC_PATH=%programfiles(x86)%\Inno Setup 6\ISCC.exe" + + if exist "%ISCC_PATH%" ( + echo ::warning::Inno Setup is already installed + exit /b 0 + ) + + echo "Downloading Inno Setup..." + + set "_url_=https://jrsoftware.org/download.php/is.exe?site=1" + set "_file_=innosetup.exe" + + curl -L -o "%tmp%\%_file_%" "%_url_%" + + echo "Installing Inno Setup..." + "%tmp%\%_file_%" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- + + if not exist "%ISCC_PATH%" ( + echo "::error::Inno Setup installation failed" + exit 1 + ) + + echo ::warning::Inno Setup installed successfully! + shell: cmd - name: 💾 Download Pre-Build Dependencies id: dependencies From d3685ef0916eb00a9e6e2dbc43227d5378f0844f Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Mon, 29 Sep 2025 22:44:10 +0200 Subject: [PATCH 6/8] Remove warning when inno setup was installed successfully --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2e48a8f51..7f1569af4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -107,7 +107,7 @@ jobs: exit 1 ) - echo ::warning::Inno Setup installed successfully! + echo "Inno Setup installed successfully!" shell: cmd - name: 💾 Download Pre-Build Dependencies From 48eb45c642b39ff56e3c882cdb538acc23cbcd1d Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Tue, 30 Sep 2025 20:12:40 +0200 Subject: [PATCH 7/8] Name Linux x86_64 files consistently as amd64 --- .github/workflows/debian.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 76a6eec54..5f28ed1c5 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -39,7 +39,7 @@ jobs: fail-fast: false matrix: os: [ - { description: Linux (x86_64), architecture: [ amd64, linux/amd64 ], platform: x11 }, + { description: Linux (amd64), architecture: [ amd64, linux/amd64 ], platform: x11 }, { description: Raspberry Pi 1 & Zero 1 (armv6), architecture: [ armv6, linux/arm/v6 ], platform: rpi }, { description: Raspberry Pi 2 (armv7), architecture: [ armv7, linux/arm/v7 ], platform: rpi }, { description: Raspberry Pi 3/4/5 & Zero 2 (arm64), architecture: [ arm64, linux/arm64 ], platform: rpi } @@ -92,7 +92,7 @@ jobs: DOCKER_TAG: ${{ inputs.codename == 'bullseye' && matrix.os.architecture[0] == 'armv6' && inputs.codename || format('{0}-qt6', inputs.codename) }} 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])]) || '' }} + CPACK_SYSTEM_PROCESSOR: ${{ format('-DCPACK_SYSTEM_PROCESSOR={0}', matrix.target_lookup[format('{0}', matrix.os.architecture[0])]) || '' }} HINT: ${{ steps.dependencies.outputs.cmakeArgs != '' && '(with pre-built dependencies)' || '(full build)' }} - name: 📦 Upload From 8ae0ed598b584b39553912c324625aeb1c47a5a1 Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Tue, 30 Sep 2025 20:26:24 +0200 Subject: [PATCH 8/8] debian.yml aktualisieren --- .github/workflows/debian.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 5f28ed1c5..018d64045 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -39,13 +39,13 @@ jobs: fail-fast: false matrix: os: [ - { description: Linux (amd64), architecture: [ amd64, linux/amd64 ], platform: x11 }, + { description: Linux (amd64), architecture: [ amd64, linux/amd64 ], platform: x11 }, { description: Raspberry Pi 1 & Zero 1 (armv6), architecture: [ armv6, linux/arm/v6 ], platform: rpi }, { description: Raspberry Pi 2 (armv7), architecture: [ armv7, linux/arm/v7 ], platform: rpi }, { description: Raspberry Pi 3/4/5 & Zero 2 (arm64), architecture: [ arm64, linux/arm64 ], platform: rpi } ] target_lookup: [ - { 'arm64': 'arm64', 'armv6': 'armv6l', 'armv7': 'armv7l' } + { 'amd64': 'amd64', 'arm64': 'arm64', 'armv6': 'armv6l', 'armv7': 'armv7l' } ] steps: