Skip to content

Commit 912083b

Browse files
authored
Update Builds (#1915)
1 parent f9747f7 commit 912083b

File tree

2 files changed

+34
-18
lines changed

2 files changed

+34
-18
lines changed

.github/workflows/debian.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ jobs:
3939
fail-fast: false
4040
matrix:
4141
os: [
42-
{ description: Linux (x86_64), architecture: [ amd64, linux/amd64 ], platform: x11 },
42+
{ description: Linux (amd64), architecture: [ amd64, linux/amd64 ], platform: x11 },
4343
{ description: Raspberry Pi 1 & Zero 1 (armv6), architecture: [ armv6, linux/arm/v6 ], platform: rpi },
4444
{ description: Raspberry Pi 2 (armv7), architecture: [ armv7, linux/arm/v7 ], platform: rpi },
4545
{ description: Raspberry Pi 3/4/5 & Zero 2 (arm64), architecture: [ arm64, linux/arm64 ], platform: rpi }
4646
]
4747
target_lookup: [
48-
{ 'arm64': 'arm64', 'armv6': 'armv6l', 'armv7': 'armv7l' }
48+
{ 'amd64': 'amd64', 'arm64': 'arm64', 'armv6': 'armv6l', 'armv7': 'armv7l' }
4949
]
5050

5151
steps:
@@ -92,7 +92,7 @@ jobs:
9292
DOCKER_TAG: ${{ inputs.codename == 'bullseye' && matrix.os.architecture[0] == 'armv6' && inputs.codename || format('{0}-qt6', inputs.codename) }}
9393
BUILD_TYPE: ${{ inputs.event_name == 'pull_request' && 'debug' || 'release' }}
9494
ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }}
95-
CPACK_SYSTEM_PROCESSOR: ${{ matrix.os.architecture[0] != 'amd64' && format('-DCPACK_SYSTEM_PROCESSOR={0}', matrix.target_lookup[format('{0}', matrix.os.architecture[0])]) || '' }}
95+
CPACK_SYSTEM_PROCESSOR: ${{ format('-DCPACK_SYSTEM_PROCESSOR={0}', matrix.target_lookup[format('{0}', matrix.os.architecture[0])]) || '' }}
9696
HINT: ${{ steps.dependencies.outputs.cmakeArgs != '' && '(with pre-built dependencies)' || '(full build)' }}
9797

9898
- name: 📦 Upload

.github/workflows/windows.yml

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
windows:
3131
name: ${{ matrix.os.description }}
32-
runs-on: ${{ matrix.os.architecture == 'arm64' && 'windows-11-arm' || 'windows-2022' }}
32+
runs-on: ${{ matrix.os.architecture == 'arm64' && 'windows-11-arm' || 'windows-2025' }}
3333
strategy:
3434
fail-fast: false
3535
matrix:
@@ -55,9 +55,9 @@ jobs:
5555
fi
5656
5757
- name: 📥 Install Python
58-
uses: actions/setup-python@v5
58+
uses: actions/setup-python@v6
5959
with:
60-
python-version: '3.13.5'
60+
python-version: '3.13.7'
6161
architecture: ${{ matrix.os.architecture }}
6262

6363
- name: 📥 Install Qt
@@ -81,19 +81,35 @@ jobs:
8181
with:
8282
arch: ${{ matrix.os.architecture }}
8383

84-
- name: 💾 Download OpenSSL 3.x
85-
uses: ethanjli/[email protected]
86-
with:
87-
url: "https://slproweb.com/download/Win64${{ matrix.os.architecture == 'arm64' && 'ARM' || '' }}OpenSSL-3_5_3.exe"
88-
destination: .\installer\openssl.exe
89-
cache-key: OpenSSL
90-
91-
- name: 📥 Install OpenSSL 3.x
92-
shell: powershell
84+
- name: Download/Install Inno Setup
9385
run: |
94-
Start-Process -FilePath ".\installer\openssl.exe" -ArgumentList "/silent", "/verysilent", "/sp-", "/suppressmsgboxes", "/DIR=C:\OpenSSL" -Wait
95-
echo "OPENSSL_ROOT_DIR=C:\OpenSSL" >> $env:GITHUB_ENV
96-
86+
echo "Checking pre-installation..."
87+
88+
set "ISCC_PATH=%programfiles(x86)%\Inno Setup 6\ISCC.exe"
89+
90+
if exist "%ISCC_PATH%" (
91+
echo ::warning::Inno Setup is already installed
92+
exit /b 0
93+
)
94+
95+
echo "Downloading Inno Setup..."
96+
97+
set "_url_=https://jrsoftware.org/download.php/is.exe?site=1"
98+
set "_file_=innosetup.exe"
99+
100+
curl -L -o "%tmp%\%_file_%" "%_url_%"
101+
102+
echo "Installing Inno Setup..."
103+
"%tmp%\%_file_%" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
104+
105+
if not exist "%ISCC_PATH%" (
106+
echo "::error::Inno Setup installation failed"
107+
exit 1
108+
)
109+
110+
echo "Inno Setup installed successfully!"
111+
shell: cmd
112+
97113
- name: 💾 Download Pre-Build Dependencies
98114
id: dependencies
99115
uses: ./.github/actions/download-pre-built-deps

0 commit comments

Comments
 (0)