Skip to content

Commit 09dee17

Browse files
committed
Merge branch 'main' into feature/components-keep-or-save-on-dispose
2 parents b29f269 + 7408b21 commit 09dee17

34 files changed

Lines changed: 787 additions & 333 deletions

.devcontainer/ubuntu-24.04/.npmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@arm-debug:registry=https://npm.pkg.github.com
1+
@open-cmsis-pack:registry=https://npm.pkg.github.com
22
//npm.pkg.github.com/:_authToken=${GITHUB_TOKEN}

.github/workflows/ci.yml

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
steps:
4141
- name: Harden the runner (Audit all outbound calls)
42-
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
42+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
4343
with:
4444
egress-policy: audit
4545

@@ -57,7 +57,7 @@ jobs:
5757
env:
5858
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5959
with:
60-
node-version: '20'
60+
node-version-file: package.json
6161
registry-url: https://npm.pkg.github.com
6262
package-manager-cache: false
6363

@@ -77,6 +77,7 @@ jobs:
7777
run: npm run build
7878

7979
- name: Update current version
80+
if: github.event_name != 'release'
8081
run: |
8182
# Increment patch version by 1 (e.g. 1.64.1 -> 1.64.2)
8283
BASE_VERSION=$(node -p "require('./package.json').version.split('-')[0]")
@@ -102,12 +103,12 @@ jobs:
102103
# Get short commit SHA
103104
SHORT_SHA=$(git rev-parse --short HEAD)
104105
105-
# Create nightly version: 1.64.2-12-abc1234
106-
NIGHTLY_VERSION="${NEXT_PATCH_VERSION}-${COMMIT_COUNT}-${SHORT_SHA}"
107-
echo "Setting version to ${NIGHTLY_VERSION}"
106+
# Create PR version: 1.64.2-12-abc1234
107+
PR_VERSION="${NEXT_PATCH_VERSION}-${COMMIT_COUNT}-${SHORT_SHA}"
108+
echo "Setting version to ${PR_VERSION}"
108109
109110
# Update package.json
110-
npm version "${NIGHTLY_VERSION}" --no-git-tag-version
111+
npm version "${PR_VERSION}" --no-git-tag-version
111112
112113
- name: Remove badges
113114
run: |
@@ -174,42 +175,42 @@ jobs:
174175
run: npm run package -- --target darwin-arm64
175176

176177
- name: Upload win32-x64 VSIX package
177-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
178+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
178179
with:
179180
name: vscode-cmsis-solution-win32-x64
180181
path: ./*win32-x64*.vsix
181182
retention-days: 1
182183

183184
- name: Upload win32-arm64 VSIX package
184-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
185+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
185186
with:
186187
name: vscode-cmsis-solution-win32-arm64
187188
path: ./*win32-arm64*.vsix
188189
retention-days: 1
189190

190191
- name: Upload linux-x64 VSIX package
191-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
192+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
192193
with:
193194
name: vscode-cmsis-solution-linux-x64
194195
path: ./*linux-x64*.vsix
195196
retention-days: 1
196197

197198
- name: Upload linux-arm64 VSIX package
198-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
199+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
199200
with:
200201
name: vscode-cmsis-solution-linux-arm64
201202
path: ./*linux-arm64*.vsix
202203
retention-days: 1
203204

204205
- name: Upload darwin-x64 VSIX package
205-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
206+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
206207
with:
207208
name: vscode-cmsis-solution-darwin-x64
208209
path: ./*darwin-x64*.vsix
209210
retention-days: 1
210211

211212
- name: Upload darwin-arm64 VSIX package
212-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
213+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
213214
with:
214215
name: vscode-cmsis-solution-darwin-arm64
215216
path: ./*darwin-arm64*.vsix
@@ -219,7 +220,7 @@ jobs:
219220
run: git diff > new-version.patch
220221

221222
- name: Store version bump patch
222-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
223+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
223224
with:
224225
name: new-version-patch
225226
path: ./new-version.patch
@@ -249,7 +250,7 @@ jobs:
249250

250251
steps:
251252
- name: Harden the runner (Audit all outbound calls)
252-
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
253+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
253254
with:
254255
egress-policy: audit
255256

@@ -264,7 +265,7 @@ jobs:
264265
env:
265266
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
266267
with:
267-
node-version: '20'
268+
node-version-file: package.json
268269
registry-url: https://npm.pkg.github.com
269270
package-manager-cache: false
270271

@@ -277,15 +278,15 @@ jobs:
277278
- name: Run Test
278279
run: npm run test
279280

280-
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
281+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
281282
if: ${{ matrix.target == 'linux-x64' }}
282283
with:
283284
name: unit-test-coverage
284285
path: ./coverage
285286

286287
- name: Publish coverage report to QLTY
287288
if: github.repository_owner == 'Open-CMSIS-Pack' && matrix.target == 'linux-x64'
288-
uses: qltysh/qlty-action/coverage@a19242102d17e497f437d7466aa01b528537e899 # v1
289+
uses: qltysh/qlty-action/coverage@a19242102d17e497f437d7466aa01b528537e899 # v2.2.0
289290
with:
290291
token: ${{ secrets.QLTY_COVERAGE_TOKEN }}
291292
files: coverage/lcov.info
@@ -299,7 +300,7 @@ jobs:
299300
contents: write
300301
steps:
301302
- name: Harden the runner (Audit all outbound calls)
302-
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
303+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
303304
with:
304305
egress-policy: audit
305306

@@ -314,22 +315,8 @@ jobs:
314315
pattern: unit-test-coverage
315316
path: test-coverage
316317

317-
- name: Download test report
318-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
319-
with:
320-
pattern: test-report-linux
321-
path: test-report-linux
322-
323-
- name: Zip test report
324-
run: zip -r test-report.zip *
325-
working-directory: test-report-linux
326-
327-
- name: Zip test coverage
328-
run: zip -r test-coverage.zip *
329-
working-directory: test-coverage
330-
331318
- name: Attach packages
332-
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
319+
uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
333320
with:
334321
files: |
335322
**/*.vsix

.github/workflows/codeql.yml

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

3434
steps:
3535
- name: Harden the runner (Audit all outbound calls)
36-
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
36+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
3737
with:
3838
egress-policy: audit
3939

.github/workflows/dependency-review.yml

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

2323
steps:
2424
- name: Harden Runner
25-
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
25+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
2626
with:
2727
egress-policy: audit
2828

.github/workflows/devcontainer.yml

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

2828
steps:
2929
- name: Harden the runner (Audit all outbound calls)
30-
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
30+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
3131
with:
3232
egress-policy: audit
3333

.github/workflows/markdown.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
actions: read
2828
steps:
2929
- name: Harden Runner
30-
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
30+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
3131
with:
3232
egress-policy: audit
3333

@@ -48,7 +48,7 @@ jobs:
4848
env:
4949
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5050
with:
51-
node-version: '20'
51+
node-version-file: package.json
5252
registry-url: https://npm.pkg.github.com
5353
package-manager-cache: false
5454

@@ -70,7 +70,7 @@ jobs:
7070
runs-on: ubuntu-latest
7171
steps:
7272
- name: Harden the runner (Audit all outbound calls)
73-
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
73+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
7474
with:
7575
egress-policy: audit
7676

.github/workflows/nightly.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: Harden the runner (Audit all outbound calls)
36-
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
36+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
3737
with:
3838
egress-policy: audit
3939

@@ -48,7 +48,7 @@ jobs:
4848
env:
4949
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5050
with:
51-
node-version: '20'
51+
node-version-file: package.json
5252
registry-url: https://npm.pkg.github.com
5353
package-manager-cache: false
5454

@@ -162,42 +162,42 @@ jobs:
162162
run: npm run package -- --target darwin-arm64
163163

164164
- name: Upload win32-x64 VSIX package
165-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
165+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
166166
with:
167167
name: vscode-cmsis-solution-nightly-win32-x64
168168
path: ./*win32-x64*.vsix
169169
retention-days: 1
170170

171171
- name: Upload win32-arm64 VSIX package
172-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
172+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
173173
with:
174174
name: vscode-cmsis-solution-nightly-win32-arm64
175175
path: ./*win32-arm64*.vsix
176176
retention-days: 1
177177

178178
- name: Upload linux-x64 VSIX package
179-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
179+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
180180
with:
181181
name: vscode-cmsis-solution-nightly-linux-x64
182182
path: ./*linux-x64*.vsix
183183
retention-days: 1
184184

185185
- name: Upload linux-arm64 VSIX package
186-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
186+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
187187
with:
188188
name: vscode-cmsis-solution-nightly-linux-arm64
189189
path: ./*linux-arm64*.vsix
190190
retention-days: 1
191191

192192
- name: Upload darwin-x64 VSIX package
193-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
193+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
194194
with:
195195
name: vscode-cmsis-solution-nightly-darwin-x64
196196
path: ./*darwin-x64*.vsix
197197
retention-days: 1
198198

199199
- name: Upload darwin-arm64 VSIX package
200-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
200+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
201201
with:
202202
name: vscode-cmsis-solution-nightly-darwin-arm64
203203
path: ./*darwin-arm64*.vsix
@@ -213,7 +213,7 @@ jobs:
213213
actions: read
214214
steps:
215215
- name: Harden the runner (Audit all outbound calls)
216-
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
216+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
217217
with:
218218
egress-policy: audit
219219

@@ -228,7 +228,7 @@ jobs:
228228
env:
229229
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
230230
with:
231-
node-version: '20'
231+
node-version-file: package.json
232232
registry-url: https://npm.pkg.github.com
233233
package-manager-cache: false
234234

@@ -271,22 +271,22 @@ jobs:
271271

272272
- name: Publish Test Results
273273
if: always() && steps.tests.conclusion != 'skipped'
274-
uses: dorny/test-reporter@3d76b34a4535afbd0600d347b09a6ee5deb3ed7f # v2.6.0
274+
uses: dorny/test-reporter@a43b3a5f7366b97d083190328d2c652e1a8b6aa2 # v3.0.0
275275
with:
276276
name: Playwright Tests
277277
path: e2e-report/results.xml
278278
reporter: jest-junit
279279

280280
- name: Upload HTML report
281281
if: always() && steps.tests.conclusion != 'skipped'
282-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
282+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
283283
with:
284284
name: e2e-report
285285
path: e2e-report
286286

287287
- name: Upload Screenshots
288288
if: always() && steps.tests.conclusion != 'skipped'
289-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
289+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
290290
with:
291291
name: e2e-screenshots
292292
path: e2e-screenshots

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Harden Runner
30-
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
30+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
3131
with:
3232
egress-policy: audit
3333

@@ -44,7 +44,7 @@ jobs:
4444
publish_results: true
4545

4646
- name: "Upload artifact"
47-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
47+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
4848
with:
4949
name: SARIF file
5050
path: results.sarif

.github/workflows/tpip.yml

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

3232
steps:
3333
- name: Harden the runner (Audit all outbound calls)
34-
uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
34+
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
3535
with:
3636
egress-policy: audit
3737

.vscodeignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@ jestSetupFile.js
3333
.env
3434
update_copyright_years.*
3535
api/**
36+
e2e-report/**
37+
e2e-screenshots/**
38+
test-results/**
39+
.qlty/**

0 commit comments

Comments
 (0)