Skip to content

Commit

Permalink
Merge branch 'develop' into bugfix/serial-subcommands
Browse files Browse the repository at this point in the history
  • Loading branch information
hhvrc committed Jan 24, 2025
2 parents 1926617 + 1397bd6 commit 1114ef6
Show file tree
Hide file tree
Showing 155 changed files with 3,654 additions and 2,170 deletions.
14 changes: 12 additions & 2 deletions .github/actions/cdn-bump-version/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,22 @@ inputs:
runs:
using: composite
steps:
- name: Upload version file
- name: Prepare Upload Folder
shell: bash
run: |
mkdir -p upload
echo "${{ inputs.version }}" >> upload/version-${{ inputs.release-channel }}.txt
sshpass -p "${{ inputs.bunny-stor-password }}" scp -v -r upload/* ${{ inputs.bunny-stor-username }}@${{ inputs.bunny-stor-hostname }}:/
- name: Upload version file
uses: milanmk/actions-file-deployer@master
with:
remote-protocol: "sftp"
remote-host: "${{ inputs.bunny-stor-hostname }}"
remote-user: "${{ inputs.bunny-stor-username }}"
remote-password: "${{ inputs.bunny-stor-password }}"
remote-path: "/"
local-path: "upload"
sync: "full"

- name: Purge CDN cache
shell: bash
Expand Down
14 changes: 12 additions & 2 deletions .github/actions/cdn-upload-firmware/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,20 @@ runs:
find . -type f -name '*.bin' -exec md5sum {} \; > hashes.md5.txt
find . -type f -name '*.bin' -exec sha256sum {} \; > hashes.sha256.txt
- name: Upload artifacts to CDN
- name: Prepare Upload Folder
shell: bash
run: |
mkdir -p upload
mv *.bin upload/
mv hashes.*.txt upload/
sshpass -p "${{ inputs.bunny-stor-password }}" scp -r upload/ ${{ inputs.bunny-stor-username }}@${{ inputs.bunny-stor-hostname }}:/${{ inputs.fw-version }}/${{ inputs.board }}
- name: Upload artifacts to CDN
uses: milanmk/actions-file-deployer@master
with:
remote-protocol: "sftp"
remote-host: "${{ inputs.bunny-stor-hostname }}"
remote-user: "${{ inputs.bunny-stor-username }}"
remote-password: "${{ inputs.bunny-stor-password }}"
remote-path: "/${{ inputs.fw-version }}/${{ inputs.board }}"
local-path: "upload"
sync: "full"
23 changes: 17 additions & 6 deletions .github/actions/cdn-upload-version-info/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,25 @@ inputs:
runs:
using: composite
steps:
- name: Create boards.txt

- name: Prepare Upload Folder
shell: bash
run: |
echo -e '${{ inputs.boards }}' >> boards.txt
rm -rf upload/
mkdir -p upload/
- name: Upload artifacts to CDN
- name: Create boards.txt
shell: bash
run: |
mkdir -p upload
mv boards.txt upload/
sshpass -p "${{ inputs.bunny-stor-password }}" scp -r upload/* ${{ inputs.bunny-stor-username }}@${{ inputs.bunny-stor-hostname }}:/${{ inputs.fw-version }}/${{ inputs.board }}
echo -e '${{ inputs.boards }}' >> upload/boards.txt
- name: Upload artifacts to CDN
uses: milanmk/actions-file-deployer@master
with:
remote-protocol: "sftp"
remote-host: "${{ inputs.bunny-stor-hostname }}"
remote-user: "${{ inputs.bunny-stor-username }}"
remote-password: "${{ inputs.bunny-stor-password }}"
remote-path: "/${{ inputs.fw-version }}/"
local-path: "upload"
sync: "full"
Empty file removed data/.gitkeep
Empty file.
7 changes: 6 additions & 1 deletion frontend/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ node_modules
.env.*
!.env.example

# Ignore files for PNPM, NPM and YARN
# Package Managers
pnpm-lock.yaml
package-lock.json
yarn.lock

# Generated or imported files
/components.json
/src/lib/_fbs
/src/lib/components/ui
30 changes: 0 additions & 30 deletions frontend/.eslintrc.cjs

This file was deleted.

20 changes: 17 additions & 3 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
.DS_Store
test-results
node_modules
/build

# Output
.output
.vercel
.netlify
.wrangler
/.svelte-kit
/package
/build

# OS
.DS_Store
Thumbs.db

# Env
.env
.env.*
!.env.example
!.env.test

# Vite
vite.config.js.timestamp-*
vite.config.ts.timestamp-*
2 changes: 1 addition & 1 deletion frontend/.npmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
engine-strict=true
engine-strict=true
7 changes: 6 additions & 1 deletion frontend/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ node_modules
.env.*
!.env.example

# Ignore files for PNPM, NPM and YARN
# Package Managers
pnpm-lock.yaml
package-lock.json
yarn.lock

# Generated or imported files
/components.json
/src/lib/_fbs
/src/lib/components/ui
3 changes: 1 addition & 2 deletions frontend/.prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"singleQuote": true,
"trailingComma": "es5",
"printWidth": 100,
"plugins": ["prettier-plugin-svelte"],
"pluginSearchDirs": ["."],
"plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
"overrides": [
{ "files": "*.svelte", "options": { "parser": "svelte" } },
{ "files": "package*.json", "options": { "tabWidth": 2, "useTabs": true } }
Expand Down
17 changes: 17 additions & 0 deletions frontend/components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"$schema": "https://next.shadcn-svelte.com/schema.json",
"style": "default",
"tailwind": {
"config": "tailwind.config.ts",
"css": "src\\app.tcss",
"baseColor": "slate"
},
"aliases": {
"components": "$lib/components",
"utils": "$lib/utils",
"ui": "$lib/components/ui",
"hooks": "$lib/hooks"
},
"typescript": true,
"registry": "https://next.shadcn-svelte.com/registry"
}
6 changes: 6 additions & 0 deletions frontend/e2e/demo.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { expect, test } from '@playwright/test';

test('home page has expected h3', async ({ page }) => {
await page.goto('/');
await expect(page.locator('h3')).toBeVisible();
});
34 changes: 34 additions & 0 deletions frontend/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import prettier from 'eslint-config-prettier';
import js from '@eslint/js';
import { includeIgnoreFile } from '@eslint/compat';
import svelte from 'eslint-plugin-svelte';
import globals from 'globals';
import { fileURLToPath } from 'node:url';
import ts from 'typescript-eslint';
const gitignorePath = fileURLToPath(new URL('./.gitignore', import.meta.url));

export default ts.config(
includeIgnoreFile(gitignorePath),
js.configs.recommended,
...ts.configs.recommended,
...svelte.configs['flat/recommended'],
prettier,
...svelte.configs['flat/prettier'],
{
languageOptions: {
globals: {
...globals.browser,
...globals.node,
},
},
},
{
files: ['**/*.svelte'],

languageOptions: {
parserOptions: {
parser: ts.parser,
},
},
}
);
101 changes: 0 additions & 101 deletions frontend/openshock-theme.ts

This file was deleted.

Loading

1 comment on commit 1114ef6

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cpp-Linter Report ⚠️

Some files did not pass the configured checks!

clang-format (v18.1.3) reports: 16 file(s) not formatted
  • include/serialization/_fbs/FirmwareBootType_generated.h
  • include/serialization/_fbs/GatewayToHubMessage_generated.h
  • include/serialization/_fbs/HubConfig_generated.h
  • include/serialization/_fbs/HubToGatewayMessage_generated.h
  • include/serialization/_fbs/HubToLocalMessage_generated.h
  • include/serialization/_fbs/LocalToHubMessage_generated.h
  • include/serialization/_fbs/OtaUpdateProgressTask_generated.h
  • include/serialization/_fbs/SemVer_generated.h
  • include/serialization/_fbs/ShockerCommandType_generated.h
  • include/serialization/_fbs/ShockerModelType_generated.h
  • include/serialization/_fbs/WifiAuthMode_generated.h
  • include/serialization/_fbs/WifiNetworkEventType_generated.h
  • include/serialization/_fbs/WifiNetwork_generated.h
  • include/serialization/_fbs/WifiScanStatus_generated.h
  • include/util/HexUtils.h
  • src/util/StringUtils.cpp

Have any feedback or feature suggestions? Share it here.

Please sign in to comment.