Skip to content

Commit 1a24526

Browse files
committed
Merge upstream main and reconcile PythonVersion regression tests
Use upstream PythonVersion sorting and latest-version selection while retaining the Conda no-Python fix. Combine upstream version tests with empty-version and discovery-order regressions.
2 parents b1d86e6 + c8009aa commit 1a24526

85 files changed

Lines changed: 7856 additions & 1550 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/code-analysis.yml‎

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

1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
16+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1717
with:
1818
fetch-depth: 0 # Full history for git analysis
1919

2020
- name: Install Python
21-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
21+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
2222
with:
2323
python-version: '3.12'
2424

2525
- name: Install uv
26-
uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a # v4.2.0
26+
uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
2727

2828
- name: Install analysis dependencies
2929
working-directory: analysis
@@ -35,7 +35,7 @@ jobs:
3535
python -m analysis.snapshot --output analysis-snapshot.json
3636
3737
- name: Upload snapshot artifact
38-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
38+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
3939
with:
4040
name: code-health-snapshot-${{ github.sha }}
4141
path: analysis-snapshot.json

‎.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/community-feedback-closer.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Close community feedback issues lacking upvotes
16-
uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
16+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
1717
with:
1818
script: |
1919
const label = 'needs community feedback';

‎.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@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
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
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout Actions
19-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
19+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2020
with:
2121
repository: 'microsoft/vscode-github-triage-actions'
2222
ref: stable

‎.github/workflows/pr-check.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
20+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2121

2222
- name: Build VSIX
2323
uses: ./.github/actions/build-vsix
@@ -30,10 +30,10 @@ jobs:
3030

3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
33+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3434

3535
- name: Install Node
36-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
36+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
3737
with:
3838
node-version: ${{ env.NODE_VERSION }}
3939
cache: 'npm'
@@ -54,10 +54,10 @@ jobs:
5454

5555
steps:
5656
- name: Checkout
57-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
57+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5858

5959
- name: Install Node
60-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
60+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
6161
with:
6262
node-version: ${{ env.NODE_VERSION }}
6363
cache: 'npm'
@@ -86,10 +86,10 @@ jobs:
8686

8787
steps:
8888
- name: Checkout
89-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
89+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
9090

9191
- name: Checkout Python Environment Tools
92-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
92+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
9393
with:
9494
repository: 'microsoft/python-environment-tools'
9595
path: 'python-env-tools-src'
@@ -103,7 +103,7 @@ jobs:
103103
uses: dtolnay/rust-toolchain@stable
104104

105105
- name: Cache Rust build
106-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
106+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
107107
with:
108108
path: |
109109
~/.cargo/registry
@@ -132,13 +132,13 @@ jobs:
132132
shell: bash
133133

134134
- name: Install Node
135-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
135+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
136136
with:
137137
node-version: ${{ env.NODE_VERSION }}
138138
cache: 'npm'
139139

140140
- name: Install Python
141-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
141+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
142142
with:
143143
python-version: ${{ matrix.python-version }}
144144

@@ -153,7 +153,7 @@ jobs:
153153

154154
- name: Run Smoke Tests (Linux)
155155
if: runner.os == 'Linux'
156-
uses: GabrielBB/xvfb-action@86d97bde4a65fe9b290c0b3fb92c2c4ed0e5302d # v1.6
156+
uses: GabrielBB/xvfb-action@b706e4e27b14669b486812790492dc50ca16b465 # v1.7
157157
with:
158158
run: npm run smoke-test
159159

@@ -173,10 +173,10 @@ jobs:
173173

174174
steps:
175175
- name: Checkout
176-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
176+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
177177

178178
- name: Checkout Python Environment Tools
179-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
179+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
180180
with:
181181
repository: 'microsoft/python-environment-tools'
182182
path: 'python-env-tools-src'
@@ -190,7 +190,7 @@ jobs:
190190
uses: dtolnay/rust-toolchain@stable
191191

192192
- name: Cache Rust build
193-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
193+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
194194
with:
195195
path: |
196196
~/.cargo/registry
@@ -219,13 +219,13 @@ jobs:
219219
shell: bash
220220

221221
- name: Install Node
222-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
222+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
223223
with:
224224
node-version: ${{ env.NODE_VERSION }}
225225
cache: 'npm'
226226

227227
- name: Install Python
228-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
228+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
229229
with:
230230
python-version: ${{ matrix.python-version }}
231231

@@ -240,7 +240,7 @@ jobs:
240240

241241
- name: Run E2E Tests (Linux)
242242
if: runner.os == 'Linux'
243-
uses: GabrielBB/xvfb-action@86d97bde4a65fe9b290c0b3fb92c2c4ed0e5302d # v1.6
243+
uses: GabrielBB/xvfb-action@b706e4e27b14669b486812790492dc50ca16b465 # v1.7
244244
with:
245245
run: npm run e2e-test
246246

@@ -263,10 +263,10 @@ jobs:
263263

264264
steps:
265265
- name: Checkout
266-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
266+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
267267

268268
- name: Checkout Python Environment Tools
269-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
269+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
270270
with:
271271
repository: 'microsoft/python-environment-tools'
272272
path: 'python-env-tools-src'
@@ -280,7 +280,7 @@ jobs:
280280
uses: dtolnay/rust-toolchain@stable
281281

282282
- name: Cache Rust build
283-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
283+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
284284
with:
285285
path: |
286286
~/.cargo/registry
@@ -309,13 +309,13 @@ jobs:
309309
shell: bash
310310

311311
- name: Install Node
312-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
312+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
313313
with:
314314
node-version: ${{ env.NODE_VERSION }}
315315
cache: 'npm'
316316

317317
- name: Install Python
318-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
318+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
319319
with:
320320
python-version: ${{ matrix.python-version }}
321321

@@ -329,14 +329,14 @@ jobs:
329329
run: npm run compile-tests
330330

331331
- name: Set up Conda
332-
uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3
332+
uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
333333
with:
334334
activate-environment: ''
335335
auto-activate: false
336336

337337
- name: Run Integration Tests (Linux)
338338
if: runner.os == 'Linux'
339-
uses: GabrielBB/xvfb-action@86d97bde4a65fe9b290c0b3fb92c2c4ed0e5302d # v1.6
339+
uses: GabrielBB/xvfb-action@b706e4e27b14669b486812790492dc50ca16b465 # v1.7
340340
with:
341341
run: npm run integration-test
342342

@@ -356,16 +356,16 @@ jobs:
356356

357357
steps:
358358
- name: Checkout
359-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
359+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
360360

361361
- name: Install Node
362-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
362+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
363363
with:
364364
node-version: ${{ env.NODE_VERSION }}
365365
cache: 'npm'
366366

367367
- name: Install Python
368-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
368+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
369369
with:
370370
python-version: ${{ matrix.python-version }}
371371

@@ -380,7 +380,7 @@ jobs:
380380

381381
- name: Run Integration Tests Multi-Root (Linux)
382382
if: runner.os == 'Linux'
383-
uses: GabrielBB/xvfb-action@86d97bde4a65fe9b290c0b3fb92c2c4ed0e5302d # v1.6
383+
uses: GabrielBB/xvfb-action@b706e4e27b14669b486812790492dc50ca16b465 # v1.7
384384
with:
385385
run: npm run integration-test-multiroot
386386

‎.github/workflows/pr-file-check.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: 'package-lock.json matches package.json'
20-
uses: brettcannon/check-for-changed-files@871d7b8b5917a4f6f06662e2262e8ffc51dff6d1 # v1.2.1
20+
uses: brettcannon/check-for-changed-files@d85c64d17b3c1d0ac57c9cc46ea39399b0d6fa71 # v1.2.2
2121
with:
2222
prereq-pattern: 'package.json'
2323
file-pattern: 'package-lock.json'
2424
skip-label: 'skip package*.json'
2525
failure-message: '${prereq-pattern} was edited but ${file-pattern} was not (the ${skip-label} label can be used to pass this check)'
2626

2727
- name: 'package.json matches package-lock.json'
28-
uses: brettcannon/check-for-changed-files@871d7b8b5917a4f6f06662e2262e8ffc51dff6d1 # v1.2.1
28+
uses: brettcannon/check-for-changed-files@d85c64d17b3c1d0ac57c9cc46ea39399b0d6fa71 # v1.2.2
2929
with:
3030
prereq-pattern: 'package-lock.json'
3131
file-pattern: 'package.json'
3232
skip-label: 'skip package*.json'
3333
failure-message: '${prereq-pattern} was edited but ${file-pattern} was not (the ${skip-label} label can be used to pass this check)'
3434

3535
- name: 'Tests'
36-
uses: brettcannon/check-for-changed-files@871d7b8b5917a4f6f06662e2262e8ffc51dff6d1 # v1.2.1
36+
uses: brettcannon/check-for-changed-files@d85c64d17b3c1d0ac57c9cc46ea39399b0d6fa71 # v1.2.2
3737
with:
3838
prereq-pattern: src/**/*.ts
3939
file-pattern: |
@@ -43,15 +43,15 @@ jobs:
4343
failure-message: 'TypeScript code was edited without also editing a test file (the ${skip-label} label can be used to pass this check)'
4444

4545
- name: 'Public API changes require a version bump'
46-
uses: brettcannon/check-for-changed-files@871d7b8b5917a4f6f06662e2262e8ffc51dff6d1 # v1.2.1
46+
uses: brettcannon/check-for-changed-files@d85c64d17b3c1d0ac57c9cc46ea39399b0d6fa71 # v1.2.2
4747
with:
4848
prereq-pattern: 'src/api.ts'
4949
file-pattern: 'api/package.json'
5050
skip-label: 'skip api version'
5151
failure-message: 'The public API (${prereq-pattern}) was changed without bumping the package version in ${file-pattern} (the ${skip-label} label can be used to pass this check)'
5252

5353
- name: 'Public API changes require a changelog entry'
54-
uses: brettcannon/check-for-changed-files@871d7b8b5917a4f6f06662e2262e8ffc51dff6d1 # v1.2.1
54+
uses: brettcannon/check-for-changed-files@d85c64d17b3c1d0ac57c9cc46ea39399b0d6fa71 # v1.2.2
5555
with:
5656
prereq-pattern: 'src/api.ts'
5757
file-pattern: 'api/CHANGELOG.md'

‎.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: minimum
2323
count: 1

0 commit comments

Comments
 (0)