Skip to content

Commit 1114ef6

Browse files
committed
Merge branch 'develop' into bugfix/serial-subcommands
2 parents 1926617 + 1397bd6 commit 1114ef6

File tree

155 files changed

+3654
-2170
lines changed

Some content is hidden

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

155 files changed

+3654
-2170
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 }}/"
46+
local-path: "upload"
47+
sync: "full"

data/.gitkeep

Whitespace-only changes.

frontend/.eslintignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ node_modules
77
.env.*
88
!.env.example
99

10-
# Ignore files for PNPM, NPM and YARN
10+
# Package Managers
1111
pnpm-lock.yaml
1212
package-lock.json
1313
yarn.lock
14+
15+
# Generated or imported files
16+
/components.json
17+
/src/lib/_fbs
18+
/src/lib/components/ui

frontend/.eslintrc.cjs

Lines changed: 0 additions & 30 deletions
This file was deleted.

frontend/.gitignore

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
1-
.DS_Store
1+
test-results
22
node_modules
3-
/build
3+
4+
# Output
5+
.output
6+
.vercel
7+
.netlify
8+
.wrangler
49
/.svelte-kit
5-
/package
10+
/build
11+
12+
# OS
13+
.DS_Store
14+
Thumbs.db
15+
16+
# Env
617
.env
718
.env.*
819
!.env.example
20+
!.env.test
21+
22+
# Vite
923
vite.config.js.timestamp-*
1024
vite.config.ts.timestamp-*

frontend/.npmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
engine-strict=true
1+
engine-strict=true

frontend/.prettierignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ node_modules
77
.env.*
88
!.env.example
99

10-
# Ignore files for PNPM, NPM and YARN
10+
# Package Managers
1111
pnpm-lock.yaml
1212
package-lock.json
1313
yarn.lock
14+
15+
# Generated or imported files
16+
/components.json
17+
/src/lib/_fbs
18+
/src/lib/components/ui

frontend/.prettierrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"singleQuote": true,
66
"trailingComma": "es5",
77
"printWidth": 100,
8-
"plugins": ["prettier-plugin-svelte"],
9-
"pluginSearchDirs": ["."],
8+
"plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
109
"overrides": [
1110
{ "files": "*.svelte", "options": { "parser": "svelte" } },
1211
{ "files": "package*.json", "options": { "tabWidth": 2, "useTabs": true } }

0 commit comments

Comments
 (0)