Skip to content

Commit b926d83

Browse files
committed
Merge branch 'develop' into release/1.5.0-rc.1
2 parents 6be53b5 + bf1f601 commit b926d83

26 files changed

Lines changed: 300 additions & 290 deletions

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ runs:
2121
- uses: actions/cache@v4
2222
with:
2323
path: |
24+
.pio/libdeps
2425
~/.platformio/platforms
2526
~/.platformio/packages
2627
~/.platformio/.cache

.github/scripts/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"dependencies": {
1111
"@actions/core": "^1.10.1",
1212
"@actions/github": "^6.0.1",
13-
"ini": "^5.0.0",
14-
"semver": "^7.7.2"
13+
"ini": "^6.0.0",
14+
"semver": "^7.7.3"
1515
},
1616
"engines": {
1717
"node": "^22.14.0",

.github/scripts/pnpm-lock.yaml

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

.github/workflows/ci-build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
timeout-minutes: 5
3232

3333
steps:
34-
- uses: actions/checkout@v5
34+
- uses: actions/checkout@v6
3535
with:
3636
sparse-checkout: |
3737
.github
@@ -48,7 +48,7 @@ jobs:
4848
timeout-minutes: 5
4949

5050
steps:
51-
- uses: actions/checkout@v5
51+
- uses: actions/checkout@v6
5252
- uses: ./.github/actions/build-staticfs
5353
with:
5454
version: ${{ needs.getvars.outputs.version }}
@@ -63,7 +63,7 @@ jobs:
6363
matrix: ${{ fromJSON(needs.getvars.outputs.board-matrix) }}
6464

6565
steps:
66-
- uses: actions/checkout@v5
66+
- uses: actions/checkout@v6
6767

6868
- uses: ./.github/actions/build-firmware
6969
with:
@@ -80,7 +80,7 @@ jobs:
8080
matrix: ${{ fromJSON(needs.getvars.outputs.board-matrix) }}
8181

8282
steps:
83-
- uses: actions/checkout@v5
83+
- uses: actions/checkout@v6
8484
with:
8585
sparse-checkout: |
8686
.github
@@ -112,7 +112,7 @@ jobs:
112112
matrix: ${{ fromJson(needs.getvars.outputs.board-matrix) }}
113113

114114
steps:
115-
- uses: actions/checkout@v5
115+
- uses: actions/checkout@v6
116116
with:
117117
sparse-checkout: |
118118
.github
@@ -139,7 +139,7 @@ jobs:
139139
environment: cdn-firmware-r2
140140

141141
steps:
142-
- uses: actions/checkout@v5
142+
- uses: actions/checkout@v6
143143
with:
144144
sparse-checkout: |
145145
.github
@@ -166,7 +166,7 @@ jobs:
166166
environment: cdn-firmware-r2
167167

168168
steps:
169-
- uses: actions/checkout@v5
169+
- uses: actions/checkout@v6
170170
with:
171171
sparse-checkout: |
172172
.github
@@ -202,7 +202,7 @@ jobs:
202202

203203
steps:
204204
- name: Download release artifacts
205-
uses: actions/download-artifact@v5
205+
uses: actions/download-artifact@v6
206206

207207
- name: Display artifacts
208208
run: ls -R

.github/workflows/codeql.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v5
41+
uses: actions/checkout@v6
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v3
45+
uses: github/codeql-action/init@v4
4646
with:
4747
languages: ${{ matrix.language }}
4848

4949
- name: Autobuild
50-
uses: github/codeql-action/autobuild@v3
50+
uses: github/codeql-action/autobuild@v4
5151

5252
# Build stuff here
5353

5454
- name: Perform CodeQL Analysis
55-
uses: github/codeql-action/analyze@v3
55+
uses: github/codeql-action/analyze@v4
5656
with:
5757
category: '/language:${{matrix.language}}'
5858

@@ -72,10 +72,10 @@ jobs:
7272

7373
steps:
7474
- name: Checkout repository
75-
uses: actions/checkout@v5
75+
uses: actions/checkout@v6
7676

7777
- name: Initialize CodeQL
78-
uses: github/codeql-action/init@v3
78+
uses: github/codeql-action/init@v4
7979
with:
8080
languages: ${{ env.language }}
8181

@@ -85,6 +85,6 @@ jobs:
8585
skip-checkout: true
8686

8787
- name: Perform CodeQL Analysis
88-
uses: github/codeql-action/analyze@v3
88+
uses: github/codeql-action/analyze@v4
8989
with:
9090
category: '/language:${{ env.language }}'

.github/workflows/cpp-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout repository
27-
uses: actions/checkout@v5
27+
uses: actions/checkout@v6
2828

2929
- uses: ./.github/actions/build-compilationdb
3030
with:

.github/workflows/get-vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
release-dev-array: ${{ steps.get-vars.outputs.release-dev-array }}
8888

8989
steps:
90-
- uses: actions/checkout@v5
90+
- uses: actions/checkout@v6
9191
with:
9292
fetch-depth: 0
9393
sparse-checkout: |
@@ -99,7 +99,7 @@ jobs:
9999
version: ${{ inputs.pnpm-version }}
100100
run_install: false
101101

102-
- uses: actions/setup-node@v5
102+
- uses: actions/setup-node@v6
103103
with:
104104
node-version-file: ./.github/scripts/package.json
105105
cache: 'pnpm'

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"tailwindcss-animate": "^1.0.7",
4646
"typescript": "^5.8.2",
4747
"typescript-eslint": "^8.26.1",
48-
"vite": "^6.3.6",
48+
"vite": "^6.4.1",
4949
"vitest": "^3.0.9"
5050
},
5151
"engines": {

0 commit comments

Comments
 (0)