Skip to content

Commit 7e718a2

Browse files
committed
merge main into highlightLiveWatch
2 parents d2434f4 + 4725b14 commit 7e718a2

23 files changed

Lines changed: 1195 additions & 50 deletions

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
steps:
5454
- name: Harden the runner (Audit all outbound calls)
55-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
55+
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
5656
with:
5757
egress-policy: audit
5858

@@ -189,7 +189,7 @@ jobs:
189189
packages: read
190190
steps:
191191
- name: Harden the runner (Audit all outbound calls)
192-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
192+
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
193193
with:
194194
egress-policy: audit
195195

@@ -250,7 +250,7 @@ jobs:
250250
packages: read
251251
steps:
252252
- name: Harden the runner (Audit all outbound calls)
253-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
253+
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
254254
with:
255255
egress-policy: audit
256256

@@ -291,7 +291,7 @@ jobs:
291291
contents: write # for softprops/action-gh-release to create a GitHub release
292292
steps:
293293
- name: Harden the runner (Audit all outbound calls)
294-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
294+
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
295295
with:
296296
egress-policy: audit
297297

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
steps:
4343
- name: Harden the runner (Audit all outbound calls)
44-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
44+
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
4545
with:
4646
egress-policy: audit
4747

@@ -51,16 +51,16 @@ jobs:
5151

5252
- name: Initialize CodeQL
5353
id: initialize
54-
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
54+
uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
5555
with:
5656
queries: security-extended
5757
languages: TypeScript
5858
source-root: src
5959

6060
- name: Autobuild
6161
id: autobuild
62-
uses: github/codeql-action/autobuild@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
62+
uses: github/codeql-action/autobuild@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
6363

6464
- name: Perform CodeQL Analysis
6565
id: analyze
66-
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
66+
uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
if: github.repository_owner == 'Open-CMSIS-Pack'
1414
steps:
1515
- name: Harden the runner (Audit all outbound calls)
16-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
16+
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
1717
with:
1818
egress-policy: audit
1919

.github/workflows/markdown.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Harden Runner
25-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
25+
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
2626
with:
2727
egress-policy: audit
2828

@@ -49,7 +49,7 @@ jobs:
4949
packages: read
5050
steps:
5151
- name: Harden the runner (Audit all outbound calls)
52-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
52+
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
5353
with:
5454
egress-policy: audit
5555

.github/workflows/nightly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
steps:
3434
- name: Harden the runner (Audit all outbound calls)
35-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
35+
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
3636
with:
3737
egress-policy: audit
3838

@@ -149,7 +149,7 @@ jobs:
149149
actions: read # For fetching workflow artifacts with 'download-tools --nightly'
150150
steps:
151151
- name: Harden the runner (Audit all outbound calls)
152-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
152+
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
153153
with:
154154
egress-policy: audit
155155

@@ -212,7 +212,7 @@ jobs:
212212
packages: read
213213
steps:
214214
- name: Harden the runner (Audit all outbound calls)
215-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
215+
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
216216
with:
217217
egress-policy: audit
218218

.github/workflows/scorecard.yml

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

3737
steps:
3838
- name: Harden Runner
39-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
39+
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
4040
with:
4141
egress-policy: audit
4242

@@ -80,6 +80,6 @@ jobs:
8080
# Upload the results to GitHub's code scanning dashboard (optional).
8181
# Commenting out will disable the upload of results to your repo's Code Scanning dashboard
8282
- name: "Upload to code-scanning"
83-
uses: github/codeql-action/upload-sarif@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
83+
uses: github/codeql-action/upload-sarif@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
8484
with:
8585
sarif_file: results.sarif

.github/workflows/tpip.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Harden the runner (Audit all outbound calls)
35-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
35+
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
3636
with:
3737
egress-policy: audit
3838

__mocks__/vscode.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ const StatusBarAlignment = {
3030
Right: 2
3131
};
3232

33+
const ConfigurationTarget = {
34+
Global: 1,
35+
Workspace: 2,
36+
};
37+
3338
const MockTreeItemCollapsibleState = {
3439
None: 0,
3540
Collapsed: 1,
@@ -118,6 +123,8 @@ module.exports = {
118123
workspace: {
119124
getConfiguration: jest.fn(() => ({
120125
get: jest.fn(),
126+
update: jest.fn().mockResolvedValue(undefined),
127+
inspect: jest.fn().mockReturnValue(undefined),
121128
})),
122129
fs: {
123130
readFile: jest.fn(uri => {
@@ -163,4 +170,5 @@ module.exports = {
163170
},
164171
EnvironmentVariableMutatorType,
165172
StatusBarAlignment,
173+
ConfigurationTarget,
166174
};

package-lock.json

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

0 commit comments

Comments
 (0)