Skip to content

Commit b2ba84d

Browse files
committed
Merge branch 'develop' into refactor/wifi-manager
2 parents 6ad45af + 95fa239 commit b2ba84d

File tree

236 files changed

+6217
-3992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+6217
-3992
lines changed

.changeset/mighty-pets-report.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'frontend': patch
3+
---
4+
5+
Improve authtoken handling in 401 responses
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'firmware': patch
3+
---
4+
5+
fix: Serial now uses CRLF rather than just LF for better compatibility

.github/actions/build-frontend/action.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,16 @@ runs:
4343
shell: bash
4444
run: pnpm run check
4545

46-
- name: Install playwright
47-
working-directory: ./frontend
48-
shell: bash
49-
run: pnpx playwright install --with-deps
46+
# FIXME: Playwirght is not working: Error: browserType.launch: Executable doesn't exist at /home/runner/.cache/ms-playwright/chromium_headless_shell-1161/chrome-linux/headless_shell
47+
# - name: Install playwright
48+
# working-directory: ./frontend
49+
# shell: bash
50+
# run: pnpx playwright install --with-deps
5051

5152
- name: Test
5253
working-directory: ./frontend
5354
shell: bash
54-
run: pnpm test
55+
run: pnpm test:unit # TODO: Change back to pnpm test when playwright is working
5556

5657
- name: Build
5758
working-directory: ./frontend

.github/actions/cdn-bump-version/action.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,22 @@ inputs:
2626
runs:
2727
using: composite
2828
steps:
29-
- name: Upload version file
29+
- name: Prepare Upload Folder
3030
shell: bash
3131
run: |
3232
mkdir -p upload
3333
echo "${{ inputs.version }}" >> upload/version-${{ inputs.release-channel }}.txt
34-
sshpass -p "${{ inputs.bunny-stor-password }}" scp -v -r upload/* ${{ inputs.bunny-stor-username }}@${{ inputs.bunny-stor-hostname }}:/
34+
35+
- name: Upload version file
36+
uses: milanmk/actions-file-deployer@master
37+
with:
38+
remote-protocol: "sftp"
39+
remote-host: "${{ inputs.bunny-stor-hostname }}"
40+
remote-user: "${{ inputs.bunny-stor-username }}"
41+
remote-password: "${{ inputs.bunny-stor-password }}"
42+
remote-path: "/"
43+
local-path: "upload"
44+
sync: "full"
3545

3646
- name: Purge CDN cache
3747
shell: bash

.github/actions/cdn-upload-firmware/action.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,20 @@ runs:
4949
find . -type f -name '*.bin' -exec md5sum {} \; > hashes.md5.txt
5050
find . -type f -name '*.bin' -exec sha256sum {} \; > hashes.sha256.txt
5151
52-
- name: Upload artifacts to CDN
52+
- name: Prepare Upload Folder
5353
shell: bash
5454
run: |
5555
mkdir -p upload
5656
mv *.bin upload/
5757
mv hashes.*.txt upload/
58-
sshpass -p "${{ inputs.bunny-stor-password }}" scp -r upload/ ${{ inputs.bunny-stor-username }}@${{ inputs.bunny-stor-hostname }}:/${{ inputs.fw-version }}/${{ inputs.board }}
58+
59+
- name: Upload artifacts to CDN
60+
uses: milanmk/actions-file-deployer@master
61+
with:
62+
remote-protocol: "sftp"
63+
remote-host: "${{ inputs.bunny-stor-hostname }}"
64+
remote-user: "${{ inputs.bunny-stor-username }}"
65+
remote-password: "${{ inputs.bunny-stor-password }}"
66+
remote-path: "/${{ inputs.fw-version }}/${{ inputs.board }}"
67+
local-path: "upload"
68+
sync: "full"

.github/actions/cdn-upload-version-info/action.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,25 @@ inputs:
2323
runs:
2424
using: composite
2525
steps:
26-
- name: Create boards.txt
26+
27+
- name: Prepare Upload Folder
2728
shell: bash
2829
run: |
29-
echo -e '${{ inputs.boards }}' >> boards.txt
30+
rm -rf upload/
31+
mkdir -p upload/
3032
31-
- name: Upload artifacts to CDN
33+
- name: Create boards.txt
3234
shell: bash
3335
run: |
34-
mkdir -p upload
35-
mv boards.txt upload/
36-
sshpass -p "${{ inputs.bunny-stor-password }}" scp -r upload/* ${{ inputs.bunny-stor-username }}@${{ inputs.bunny-stor-hostname }}:/${{ inputs.fw-version }}/${{ inputs.board }}
36+
echo -e '${{ inputs.boards }}' >> upload/boards.txt
37+
38+
- name: Upload artifacts to CDN
39+
uses: milanmk/actions-file-deployer@master
40+
with:
41+
remote-protocol: "sftp"
42+
remote-host: "${{ inputs.bunny-stor-hostname }}"
43+
remote-user: "${{ inputs.bunny-stor-username }}"
44+
remote-password: "${{ inputs.bunny-stor-password }}"
45+
remote-path: "/${{ inputs.fw-version }}/"
46+
local-path: "upload"
47+
sync: "full"

.github/scripts/package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@
99
},
1010
"dependencies": {
1111
"@actions/core": "^1.10.1",
12-
"@actions/github": "^6.0.0",
12+
"@actions/github": "^6.0.1",
1313
"ini": "^5.0.0",
14-
"semver": "^7.6.0"
14+
"semver": "^7.7.2"
1515
},
1616
"engines": {
17-
"node": ">=20.18",
18-
"pnpm": ">=9"
17+
"node": "^22.14.0",
18+
"pnpm": "^10.6.4"
1919
},
2020
"volta": {
21-
"node": "20.18.0"
22-
}
21+
"node": "22.14.0"
22+
},
23+
"packageManager": "[email protected]"
2324
}

.github/scripts/pnpm-lock.yaml

Lines changed: 59 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)