Skip to content

Commit f5d508c

Browse files
authored
Merge branch 'main' into fix/issue-1958
2 parents 6d9ae06 + f095a47 commit f5d508c

10 files changed

Lines changed: 57 additions & 58 deletions

File tree

.github/dependabot.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "github-actions"
4-
directory: "/"
3+
- package-ecosystem: 'github-actions'
4+
directory: '/'
55
groups:
66
github-actions:
7-
patterns: ["*"]
7+
patterns: ['*']
88
schedule:
9-
interval: "weekly"
9+
interval: 'weekly'
1010
cooldown:
1111
default-days: 7

.github/workflows/codeql-analysis.yml

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

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
41+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4242
with:
4343
persist-credentials: false
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@f3712979fa5f215279b101dd0a2e3bdfb4353324 # v3.37.7
47+
uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
5555
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5656
# If this step fails, then you should remove it and run the build manually (see below)
5757
- name: Autobuild
58-
uses: github/codeql-action/autobuild@f3712979fa5f215279b101dd0a2e3bdfb4353324 # v3.37.7
58+
uses: github/codeql-action/autobuild@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
5959

6060
# ℹ️ Command-line programs to run using the OS shell.
6161
# 📚 https://git.io/JvXDl
@@ -69,4 +69,4 @@ jobs:
6969
# make release
7070

7171
- name: Perform CodeQL Analysis
72-
uses: github/codeql-action/analyze@f3712979fa5f215279b101dd0a2e3bdfb4353324 # v3.37.7
72+
uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7

.github/workflows/community-feedback-auto-comment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
issues: write
1313
steps:
1414
- name: Check For Existing Comment
15-
uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
15+
uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad # v4.0.0
1616
id: finder
1717
with:
1818
issue-number: ${{ github.event.issue.number }}
@@ -21,7 +21,7 @@ jobs:
2121

2222
- name: Add Community Feedback Comment
2323
if: steps.finder.outputs.comment-id == ''
24-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
24+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
2525
with:
2626
issue-number: ${{ github.event.issue.number }}
2727
body: |

.github/workflows/info-needed-closer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout Actions
17-
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
17+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1818
with:
1919
repository: 'microsoft/vscode-github-triage-actions'
2020
path: ./actions

.github/workflows/issue-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout Actions
20-
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
20+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2121
with:
2222
repository: 'microsoft/vscode-github-triage-actions'
2323
ref: stable

.github/workflows/pr-check.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
21+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2222
with:
2323
persist-credentials: false
2424

@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
35+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3636
with:
3737
persist-credentials: false
3838

@@ -55,15 +55,15 @@ jobs:
5555

5656
steps:
5757
- name: Checkout
58-
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
58+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5959
with:
6060
path: ${{ env.special-working-directory-relative }}
6161
persist-credentials: false
6262

6363
# Install bundled libs using 3.10 (minimum supported; debugpy dropped 3.9 support,
6464
# and pip 26.1+ requires Python >= 3.10).
6565
- name: Use Python 3.10
66-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
66+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
6767
with:
6868
python-version: '3.10'
6969

@@ -77,7 +77,7 @@ jobs:
7777
shell: bash
7878

7979
- name: Install Node
80-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
80+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
8181
with:
8282
node-version: ${{ env.NODE_VERSION }}
8383
cache: 'npm'
@@ -89,7 +89,7 @@ jobs:
8989
# Now that the bundle is installed to target using python 3.9
9090
# switch back the python we want to test with
9191
- name: Use Python ${{ matrix.python }}
92-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
92+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
9393
with:
9494
python-version: ${{ matrix.python }}
9595

.github/workflows/pr-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
pull-requests: write
1818
steps:
1919
- name: 'PR impact specified'
20-
uses: mheap/github-action-required-labels@388fd6af37b34cdfe5a23b37060e763217e58b03 # v5.5.0
20+
uses: mheap/github-action-required-labels@23e10fde7e062233401931a0eece796cd9bf3177 # v5.6.0
2121
with:
2222
mode: exactly
2323
count: 1

.github/workflows/push-check.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
26+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2727
with:
2828
persist-credentials: false
2929

@@ -37,7 +37,7 @@ jobs:
3737
runs-on: ubuntu-latest
3838
steps:
3939
- name: Checkout
40-
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
40+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4141
with:
4242
persist-credentials: false
4343

@@ -60,15 +60,15 @@ jobs:
6060

6161
steps:
6262
- name: Checkout
63-
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
63+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6464
with:
6565
path: ${{ env.special-working-directory-relative }}
6666
persist-credentials: false
6767

6868
# Install bundled libs using 3.10 (minimum supported; debugpy dropped 3.9 support,
6969
# and pip 26.1+ requires Python >= 3.10).
7070
- name: Use Python 3.10
71-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
71+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
7272
with:
7373
python-version: '3.10'
7474

@@ -82,7 +82,7 @@ jobs:
8282
shell: bash
8383

8484
- name: Install Node
85-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
85+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
8686
with:
8787
node-version: ${{ env.NODE_VERSION }}
8888
cache: 'npm'
@@ -94,7 +94,7 @@ jobs:
9494
# Now that the bundle is installed to target using python 3.9
9595
# switch back the python we want to test with
9696
- name: Use Python ${{ matrix.python }}
97-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
97+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
9898
with:
9999
python-version: ${{ matrix.python }}
100100

package-lock.json

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

src/test/unittest/common/application/commands/reportIssueCommand.unit.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ suite('Report Issue Command', () => {
4141
});
4242

4343
test('Test if issue body is filled correctly when including all the settings', async () => {
44+
executeCommandStub.withArgs('workbench.action.openIssueReporter', sinon.match.any).resolves();
4445
await openReportIssue();
4546

4647
const issueTemplatePath = path.join(
@@ -61,8 +62,6 @@ suite('Report Issue Command', () => {
6162
);
6263
const expectedData = fs.readFileSync(userDataTemplatePath, 'utf8');
6364

64-
executeCommandStub.withArgs('workbench.action.openIssueReporter', sinon.match.any).resolves();
65-
6665
sinon.assert.calledOnceWithExactly(executeCommandStub, 'workbench.action.openIssueReporter', sinon.match.any);
6766

6867
const { issueBody, data } = executeCommandStub.getCall(0).args[1];

0 commit comments

Comments
 (0)