Skip to content

Commit 138c09f

Browse files
committed
Merge branch 'develop' into feature/ditch-arduino-serial
2 parents 48f17b4 + cbb0503 commit 138c09f

24 files changed

+226
-122
lines changed

.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 }}/${{ inputs.board }}"
46+
local-path: "upload"
47+
sync: "full"

frontend/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,28 @@
1717
},
1818
"devDependencies": {
1919
"@floating-ui/dom": "1.6.12",
20-
"@playwright/test": "1.48.2",
20+
"@playwright/test": "1.49.0",
2121
"@skeletonlabs/skeleton": "2.10.3",
2222
"@skeletonlabs/tw-plugin": "0.4.0",
2323
"@sveltejs/adapter-static": "^3.0.6",
24-
"@sveltejs/kit": "2.8.1",
24+
"@sveltejs/kit": "2.8.3",
2525
"@sveltejs/vite-plugin-svelte": "^3.1.2",
2626
"@tailwindcss/forms": "0.5.9",
2727
"@tailwindcss/typography": "0.5.15",
28-
"@types/node": "22.9.0",
28+
"@types/node": "22.9.3",
2929
"autoprefixer": "10.4.20",
3030
"eslint": "^9.15.0",
3131
"eslint-config-prettier": "9.1.0",
3232
"eslint-plugin-svelte": "2.46.0",
33-
"flatbuffers": "24.3.25",
33+
"flatbuffers": "24.12.23",
3434
"postcss": "8.4.49",
3535
"prettier": "3.3.3",
36-
"prettier-plugin-svelte": "3.2.8",
36+
"prettier-plugin-svelte": "3.3.2",
3737
"svelte": "4.2.19",
38-
"svelte-check": "4.0.9",
38+
"svelte-check": "4.1.0",
3939
"tailwindcss": "3.4.15",
4040
"tslib": "2.8.1",
41-
"typescript": "5.6.3",
41+
"typescript": "5.7.2",
4242
"vite-plugin-tailwind-purgecss": "^0.3.3",
4343
"vitest": "2.1.5"
4444
},

0 commit comments

Comments
 (0)