Skip to content

Commit 2f6425a

Browse files
awawa-devawawa-dev
committed
Merge branch 'master' into zigbee2mqtt
2 parents ac6fd42 + 1ce4c3a commit 2f6425a

34 files changed

+527
-274
lines changed

Diff for: ‎.github/actions/codeql/action.yml

+11-9
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,29 @@ runs:
2626
build-essential \
2727
cmake \
2828
git \
29+
libgtk-3-dev \
30+
libayatana-appindicator3-dev \
2931
libasound2-dev \
3032
libegl-dev \
31-
libftdi-dev \
33+
libflatbuffers-dev flatbuffers-compiler \
34+
libftdi1-dev \
3235
libgl-dev \
3336
libglvnd-dev \
37+
liblzma-dev \
3438
libpipewire-0.3-dev \
3539
libqt5serialport5-dev \
36-
libqt5sql5-sqlite \
37-
libqt5svg5-dev \
38-
libqt5x11extras5-dev \
3940
libssl-dev \
41+
libsystemd-dev \
4042
libturbojpeg0-dev \
4143
libusb-1.0-0-dev \
4244
libx11-dev \
4345
libzstd-dev \
44-
nasm \
45-
python3-minimal \
46+
pkg-config \
4647
qtbase5-dev \
47-
qdbus-qt5 \
48-
rpm \
49-
libsystemd-dev
48+
wget \
49+
unzip \
50+
pkg-config \
51+
python3
5052
5153
- name: Checkout repository
5254
uses: actions/checkout@v4

Diff for: ‎.github/workflows/image-builder-from-repo.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
echo "image=$IMAGE" >> $GITHUB_OUTPUT
100100
101101
# artifact upload will take care of zipping for us
102-
- uses: actions/upload-artifact@v4.4.3
102+
- uses: actions/upload-artifact@v4.5.0
103103
with:
104104
name: ${{ steps.copy.outputs.image }}
105105
path: ${{ steps.copy.outputs.image }}.img.xz

Diff for: ‎.github/workflows/image-builder.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
echo "image=$IMAGE" >> $GITHUB_OUTPUT
122122
123123
# artifact upload will take care of zipping for us
124-
- uses: actions/upload-artifact@v4.4.3
124+
- uses: actions/upload-artifact@v4.5.0
125125
with:
126126
name: ${{ steps.copy.outputs.image }}
127127
path: ${{ steps.copy.outputs.image }}.img

Diff for: ‎.github/workflows/push-master.yml

+54-40
Original file line numberDiff line numberDiff line change
@@ -18,58 +18,72 @@ jobs:
1818

1919
Linux:
2020
name: ${{ matrix.dockerName }}
21-
runs-on: ubuntu-22.04
22-
21+
runs-on: ${{ matrix.runner }}
2322
strategy:
2423
matrix:
25-
linuxVersion: [ bullseye ]
26-
dockerImage: [ x86_64, arm-32bit-armv6l, arm-64bit-aarch64 ]
27-
include:
28-
- dockerImage: x86_64
24+
include:
25+
- runner: ubuntu-24.04
26+
dockerImage: x86_64
2927
linuxVersion: bullseye
3028
dockerName: Debian Bullseye (x86_64)
3129
platform: linux
32-
- dockerImage: x86_64
30+
- runner: ubuntu-24.04
31+
dockerImage: x86_64
3332
linuxVersion: bookworm
3433
dockerName: Debian Bookworm (x86_64)
3534
platform: linux
36-
- dockerImage: x86_64
35+
- runner: ubuntu-24.04
36+
dockerImage: x86_64
3737
linuxVersion: jammy
3838
dockerName: Ubuntu 22.04 LTS (x86_64)
3939
platform: linux
40-
- dockerImage: x86_64
40+
- runner: ubuntu-24.04
41+
dockerImage: x86_64
4142
linuxVersion: noble
4243
dockerName: Ubuntu 24.04 LTS (x86_64)
4344
platform: linux
44-
- dockerImage: x86_64
45+
- runner: ubuntu-24.04
46+
dockerImage: x86_64
4547
linuxVersion: oracular
4648
dockerName: Ubuntu 24.10 (x86_64)
47-
platform: linux
48-
- dockerImage: arm-32bit-armv6l
49+
platform: linux
50+
- runner: ubuntu-24.04
51+
dockerImage: x86_64
52+
linuxVersion: Fedora_41
53+
dockerName: Fedora 41 (x86_64)
54+
platform: linux
55+
- runner: ubuntu-24.04
56+
dockerImage: x86_64
57+
linuxVersion: ArchLinux
58+
dockerName: Arch Linux (x86_64)
59+
platform: linux
60+
- runner: ubuntu-24.04-arm
61+
dockerImage: arm-32bit-armv6l-native
4962
linuxVersion: bullseye
50-
dockerName: Debian Bullseye (ARM 32-bit Raspberry Pi OS)
63+
dockerName: Debian Bullseye (native ARM 32-bit Raspberry Pi OS)
5164
platform: rpi
52-
- dockerImage: arm-64bit-aarch64
65+
- runner: ubuntu-24.04-arm
66+
dockerImage: arm-64bit-aarch64-native
5367
linuxVersion: bullseye
54-
dockerName: Debian Bullseye (ARM 64-bit Raspberry Pi OS)
68+
dockerName: Debian Bullseye (native ARM 64-bit Raspberry Pi OS)
5569
platform: rpi
56-
- dockerImage: arm-32bit-armv6l
70+
- runner: ubuntu-24.04-arm
71+
dockerImage: arm-32bit-armv6l-native
5772
linuxVersion: bookworm
58-
dockerName: Debian Bookworm (ARM 32-bit Raspberry Pi OS)
73+
dockerName: Debian Bookworm (native ARM 32-bit Raspberry Pi OS)
5974
platform: rpi
60-
- dockerImage: arm-64bit-aarch64
75+
- runner: ubuntu-24.04-arm
76+
dockerImage: arm-64bit-aarch64-native
6177
linuxVersion: bookworm
62-
dockerName: Debian Bookworm (ARM 64-bit Raspberry Pi OS)
63-
platform: rpi
64-
- dockerImage: x86_64
65-
linuxVersion: Fedora_41
66-
dockerName: Fedora 41 (x86_64)
67-
platform: linux
68-
- dockerImage: x86_64
69-
linuxVersion: ArchLinux
70-
dockerName: Arch Linux (x86_64)
71-
platform: linux
78+
dockerName: Debian Bookworm (native ARM 64-bit Raspberry Pi OS)
79+
platform: rpi
7280
steps:
81+
# start docker
82+
- name: Wake-up docker
83+
if: matrix.runner == 'ubuntu-24.04-arm'
84+
run: |
85+
sudo systemctl start docker
86+
7387
# checkout
7488
- uses: actions/[email protected]
7589
with:
@@ -87,7 +101,7 @@ jobs:
87101
# download cache
88102
- name: Download ccache files
89103
if: env.USE_CACHE == 'true'
90-
uses: actions/cache@v4.1.2
104+
uses: actions/cache@v4.2.0
91105
with:
92106
path: .ccache
93107
key: ${{ matrix.linuxVersion }}-${{ matrix.dockerImage }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
@@ -119,15 +133,15 @@ jobs:
119133
# Upload artifacts (only on tagged commit)
120134
- name: Upload artifacts
121135
if: startsWith(github.event.ref, 'refs/tags') && github.event_name != 'pull_request'
122-
uses: actions/upload-artifact@v4.4.3
136+
uses: actions/upload-artifact@v4.5.0
123137
with:
124138
name: release-artifact-${{ matrix.linuxVersion }}-${{ matrix.dockerImage }}
125139
path: deploy/Hyper*
126140

127141
# Upload artifacts from commit
128142
- name: Upload artifacts from commit
129143
if: (startsWith(github.event.ref, 'refs/tags') != true) && github.event_name != 'pull_request'
130-
uses: actions/upload-artifact@v4.4.3
144+
uses: actions/upload-artifact@v4.5.0
131145
with:
132146
name: Linux-${{ matrix.linuxVersion }}-${{ matrix.dockerImage }}-installer
133147
path: |
@@ -171,7 +185,7 @@ jobs:
171185
# Download cache
172186
- name: Download ccache files
173187
if: env.USE_CACHE == 'true'
174-
uses: actions/cache@v4.1.2
188+
uses: actions/cache@v4.2.0
175189
with:
176190
path: build/.ccache
177191
key: macOS-ccache-${{ matrix.NICE_NAME }}-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
@@ -208,15 +222,15 @@ jobs:
208222
# Upload artifacts (only on tagged commit)
209223
- name: Upload artifacts
210224
if: startsWith(github.event.ref, 'refs/tags') && github.event_name != 'pull_request'
211-
uses: actions/upload-artifact@v4.4.3
225+
uses: actions/upload-artifact@v4.5.0
212226
with:
213227
name: release-artifact-${{ matrix.JOB_RUNNER }}
214228
path: build/Hyper*.dmg
215229

216230
# Upload artifacts from commit
217231
- name: Upload artifacts from commit
218232
if: (startsWith(github.event.ref, 'refs/tags') != true) && github.event_name != 'pull_request'
219-
uses: actions/upload-artifact@v4.4.3
233+
uses: actions/upload-artifact@v4.5.0
220234
with:
221235
name: Apple_macOS_${{ matrix.NICE_NAME }}_DMG_installer
222236
path: build/Hyper*.dmg
@@ -238,7 +252,7 @@ jobs:
238252
submodules: true
239253

240254
- name: Cache Qt
241-
uses: actions/cache@v4.1.2
255+
uses: actions/cache@v4.2.0
242256
id: cache-qt-windows
243257
with:
244258
path: ${{ runner.workspace }}/Qt
@@ -262,7 +276,7 @@ jobs:
262276
# Download cache
263277
- name: Download ccache files
264278
if: env.USE_CACHE == 'true'
265-
uses: actions/cache@v4.1.2
279+
uses: actions/cache@v4.2.0
266280
with:
267281
path: build/.ccache
268282
key: ${{ runner.os }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
@@ -307,15 +321,15 @@ jobs:
307321
# Upload artifacts (only on tagged commit)
308322
- name: Upload artifacts
309323
if: startsWith(github.event.ref, 'refs/tags') && github.event_name != 'pull_request'
310-
uses: actions/upload-artifact@v4.4.3
324+
uses: actions/upload-artifact@v4.5.0
311325
with:
312326
name: release-artifact-windows
313327
path: build/Hyper*
314328

315329
# Upload artifacts from commit
316330
- name: Upload artifacts from commit
317331
if: (startsWith(github.event.ref, 'refs/tags') != true) && github.event_name != 'pull_request'
318-
uses: actions/upload-artifact@v4.4.3
332+
uses: actions/upload-artifact@v4.5.0
319333
with:
320334
name: Windows_x64_setup
321335
path: build/Hyper*.exe
@@ -326,7 +340,7 @@ jobs:
326340

327341
analyze:
328342
name: Analyze (CodeQL)
329-
runs-on: ubuntu-latest
343+
runs-on: ubuntu-24.04
330344
if: ${{ vars.USE_CODEQL == 'true' && vars.USE_CODEQL || false }}
331345

332346
permissions:
@@ -389,7 +403,7 @@ jobs:
389403

390404
# create draft release and upload artifacts
391405
- name: Create draft release
392-
uses: softprops/action-gh-release@v2.1.0
406+
uses: softprops/action-gh-release@v2.2.0
393407
with:
394408
name: HyperHDR ${{ env.VERSION }}
395409
tag_name: ${{ env.TAG }}

Diff for: ‎.github/workflows/upload-to-github-pages.yml

+27-13
Original file line numberDiff line numberDiff line change
@@ -15,58 +15,72 @@ jobs:
1515
######################################
1616
Linux:
1717
name: ${{ matrix.niceName }} ${{ matrix.linuxVersion }} (${{ matrix.arch }})
18-
runs-on: ubuntu-22.04
18+
runs-on: ${{ matrix.runner }}
1919

2020
strategy:
2121
matrix:
2222
niceName: [ Debian ]
2323
linuxVersion: [ bullseye, bookworm ]
24-
dockerImage: [ x86_64, arm-32bit-armv6l, arm-64bit-aarch64 ]
24+
dockerImage: [ x86_64, arm-32bit-armv6l-native, arm-64bit-aarch64-native ]
2525
include:
26-
- dockerImage: x86_64
26+
- runner: ubuntu-24.04
27+
dockerImage: x86_64
2728
dockerName: Debian (amd64)
2829
arch: amd64
2930
platform: linux
30-
- dockerImage: arm-32bit-armv6l
31+
- runner: ubuntu-24.04-arm
32+
dockerImage: arm-32bit-armv6l-native
3133
dockerName: Debian (armhf)
3234
arch: armhf
3335
platform: rpi
34-
- dockerImage: arm-64bit-aarch64
36+
- runner: ubuntu-24.04-arm
37+
dockerImage: arm-64bit-aarch64-native
3538
dockerName: Debian (arm64)
3639
arch: arm64
3740
platform: rpi
38-
- dockerImage: x86_64
41+
- runner: ubuntu-24.04
42+
dockerImage: x86_64
3943
linuxVersion: ArchLinux
4044
dockerName: Arch Linux (x86_64)
4145
arch: amd64
4246
platform: linux
4347
niceName: ""
44-
- dockerImage: x86_64
48+
- runner: ubuntu-24.04
49+
dockerImage: x86_64
4550
linuxVersion: jammy
4651
dockerName: Ubuntu 22.04 LTS (x86_64)
4752
arch: amd64
4853
platform: linux
4954
niceName: Ubuntu 22.04 LTS
50-
- dockerImage: x86_64
55+
- runner: ubuntu-24.04
56+
dockerImage: x86_64
5157
linuxVersion: noble
5258
dockerName: Ubuntu 24.04 LTS (x86_64)
5359
arch: amd64
5460
platform: linux
5561
niceName: Ubuntu 24.04 LTS
56-
- dockerImage: x86_64
62+
- runner: ubuntu-24.04
63+
dockerImage: x86_64
5764
linuxVersion: oracular
5865
dockerName: Ubuntu 24.10 (x86_64)
5966
arch: amd64
6067
platform: linux
6168
niceName: Ubuntu 24.10
62-
- dockerImage: x86_64
69+
- runner: ubuntu-24.04
70+
dockerImage: x86_64
6371
linuxVersion: Fedora_41
6472
dockerName: Fedora 41 (x86_64)
6573
arch: amd64
6674
platform: linux
6775
niceName: Fedora 41
6876

6977
steps:
78+
# start docker
79+
- name: Wake-up docker
80+
if: matrix.runner == 'ubuntu-24.04-arm'
81+
run: |
82+
sudo systemctl start docker
83+
7084
# checkout
7185
- uses: actions/[email protected]
7286
with:
@@ -84,7 +98,7 @@ jobs:
8498
# download cache
8599
- name: ccache cache files
86100
if: ( env.USE_CACHE == '1' )
87-
uses: actions/cache@v4.1.2
101+
uses: actions/cache@v4.2.0
88102
with:
89103
path: .ccache
90104
key: ${{ matrix.linuxVersion }}-${{ matrix.dockerImage }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
@@ -118,7 +132,7 @@ jobs:
118132
rm -r repo/pool/ArchLinux ||:
119133
120134
- name: Upload artifacts from commit
121-
uses: actions/upload-artifact@v4.4.3
135+
uses: actions/upload-artifact@v4.5.0
122136
with:
123137
name: release-artifact-${{ matrix.linuxVersion }}-${{ matrix.dockerImage }}
124138
path: repo
@@ -142,7 +156,7 @@ jobs:
142156
- name: Display structure of artifacts
143157
run: ls -R repo
144158
- name: Deploy the packages
145-
uses: JamesIves/[email protected].1
159+
uses: JamesIves/[email protected].2
146160
with:
147161
repository-name: awawa-dev/awawa-dev.github.io
148162
branch: upload

Diff for: ‎.gitmodules

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
path = external/qmqtt
1414
url = https://github.com/emqx/qmqtt.git
1515
ignore = dirty
16-
[submodule "external/xz"]
17-
path = external/xz
18-
url = https://github.com/tukaani-project/xz.git
1916
[submodule "external/mdns"]
2017
path = external/mdns
2118
url = https://github.com/mjansson/mdns.git
@@ -34,3 +31,6 @@
3431
[submodule "external/linalg"]
3532
path = external/linalg
3633
url = https://github.com/sgorsten/linalg.git
34+
[submodule "external/zstd"]
35+
path = external/zstd
36+
url = https://github.com/facebook/zstd.git

0 commit comments

Comments
 (0)