Skip to content

Commit 49512f8

Browse files
authored
Merge pull request #2 from Lord-Grey/build
2 parents 29eba9f + 77e2bf7 commit 49512f8

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.github/workflows/push_pull.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
uses: actions/checkout@v4
4343

4444
- name: 💾 Download Artifacts
45-
uses: actions/download-artifact@v4
45+
uses: actions/download-artifact@v5
4646
with:
4747
path: ${{ github.workspace }}/artifacts
4848

.github/workflows/qt5_6.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,28 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
os: [
31-
{ distribution: debian, codename: bullseye, description: Debian Bullseye (x86_64), architecture: [ amd64, linux/amd64 ], platform: x11, qt_version: '6' },
31+
{ distribution: debian, codename: bullseye, description: Debian Bullseye (amd64), architecture: [ amd64, linux/amd64 ], platform: x11, qt_version: '6' },
3232
{ distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 1 & Zero 1), architecture: [ armv6, linux/arm/v6 ], platform: rpi, qt_version: '5' }, # Qt6 not available on Debian Bullseye (armv6)
3333
{ distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 2), architecture: [ armv7, linux/arm/v7 ], platform: rpi, qt_version: '6' },
3434
{ distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 3/4/5 & Zero 2), architecture: [ arm64, linux/arm64 ], platform: rpi, qt_version: '6' },
35-
{ distribution: debian, codename: bookworm, description: Debian Bookworm (x86_64), architecture: [ amd64, linux/amd64 ], platform: x11, qt_version: '6' },
35+
{ distribution: debian, codename: bookworm, description: Debian Bookworm (amd64), architecture: [ amd64, linux/amd64 ], platform: x11, qt_version: '6' },
3636
{ distribution: debian, codename: bookworm, description: Debian Bookworm (Raspberry Pi 1 & Zero 1), architecture: [ armv6, linux/arm/v6 ], platform: rpi, qt_version: '6' },
3737
{ distribution: debian, codename: bookworm, description: Debian Bookworm (Raspberry Pi 2), architecture: [ armv7, linux/arm/v7 ], platform: rpi, qt_version: '6' },
3838
{ distribution: debian, codename: bookworm, description: Debian Bookworm (Raspberry Pi 3/4/5 & Zero 2), architecture: [ arm64, linux/arm64 ], platform: rpi, qt_version: '6' },
39-
{ distribution: debian, codename: trixie, description: Debian Trixie (x86_64), architecture: [ amd64, linux/amd64 ], platform: x11, qt_version: '6' },
39+
{ distribution: debian, codename: trixie, description: Debian Trixie (amd64), architecture: [ amd64, linux/amd64 ], platform: x11, qt_version: '6' },
4040
{ distribution: debian, codename: trixie, description: Debian Trixie (Raspberry Pi 1 & Zero 1), architecture: [ armv6, linux/arm/v6 ], platform: rpi, qt_version: '6' },
4141
{ distribution: debian, codename: trixie, description: Debian Trixie (Raspberry Pi 2), architecture: [ armv7, linux/arm/v7 ], platform: rpi, qt_version: '6' },
4242
{ distribution: debian, codename: trixie, description: Debian Trixie (Raspberry Pi 3/4/5 & Zero 2), architecture: [ arm64, linux/arm64 ], platform: rpi, qt_version: '6' }
4343
]
4444

4545
steps:
4646
- name: ⬇ Checkout
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v5
4848
with:
4949
submodules: recursive
5050

5151
- name: ⬇ Clone hyperion.ng repository
52-
uses: actions/checkout@v4
52+
uses: actions/checkout@v5
5353
with:
5454
repository: hyperion-project/hyperion.ng
5555
submodules: recursive
@@ -85,20 +85,20 @@ jobs:
8585

8686
macos:
8787
name: 🍏 macOS ${{ matrix.architecture }}
88-
runs-on: ${{ matrix.architecture == 'arm64' && 'macos-14' || 'macos-13' }}
88+
runs-on: ${{ matrix.architecture == 'x64' && 'macos-15-intel' || 'macos-15' }}
8989
strategy:
9090
fail-fast: false
9191
matrix:
9292
architecture: [ arm64, x64 ]
9393

9494
steps:
9595
- name: ⬇ Checkout
96-
uses: actions/checkout@v4
96+
uses: actions/checkout@v5
9797
with:
9898
submodules: recursive
9999

100100
- name: ⬇ Clone hyperion.ng repository
101-
uses: actions/checkout@v4
101+
uses: actions/checkout@v5
102102
with:
103103
repository: hyperion-project/hyperion.ng
104104
submodules: recursive
@@ -131,7 +131,7 @@ jobs:
131131

132132
windows:
133133
name: 🪟 Windows ${{ matrix.architecture }}
134-
runs-on: ${{ matrix.architecture == 'arm64' && 'windows-11-arm' || 'windows-2022' }}
134+
runs-on: ${{ matrix.architecture == 'arm64' && 'windows-11-arm' || 'windows-2025' }}
135135
env:
136136
BUILD_TYPE: ${{ inputs.build_type == 'debug' && 'relwithdebinfo' || inputs.build_type }}
137137
strategy:
@@ -141,21 +141,21 @@ jobs:
141141

142142
steps:
143143
- name: ⬇ Checkout
144-
uses: actions/checkout@v4
144+
uses: actions/checkout@v5
145145
with:
146146
submodules: recursive
147147

148148
- name: ⬇ Clone hyperion.ng repository
149-
uses: actions/checkout@v4
149+
uses: actions/checkout@v5
150150
with:
151151
repository: hyperion-project/hyperion.ng
152152
submodules: recursive
153153
path: hyperion
154154

155155
- name: 📥 Install Python
156-
uses: actions/setup-python@v5
156+
uses: actions/setup-python@v6
157157
with:
158-
python-version: '3.13.3'
158+
python-version: '3.13.7'
159159
architecture: ${{ matrix.architecture }}
160160

161161
- name: 📥 Install Qt

0 commit comments

Comments
 (0)