From 28b7011256ae97ded8eb0db5b3e67a7e24fd180c Mon Sep 17 00:00:00 2001 From: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 9 Feb 2026 20:11:22 -0800 Subject: [PATCH 1/2] trivial edit test --- src/client/testing/testController/common/utils.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/testing/testController/common/utils.ts b/src/client/testing/testController/common/utils.ts index 606865e5ad7e..587cda7ac8f1 100644 --- a/src/client/testing/testController/common/utils.ts +++ b/src/client/testing/testController/common/utils.ts @@ -37,6 +37,7 @@ interface ExecutionResultMessage extends Message { * On Windows, it returns the default temporary directory. * On macOS/Linux, it prefers the `XDG_RUNTIME_DIR` environment variable if set, * otherwise, it falls back to the default temporary directory. + * trivial edit * * @returns {string} The path to the temporary directory. */ From c89c7c9a8d5b1767facf70f9e0dfd4deaade87b3 Mon Sep 17 00:00:00 2001 From: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com> Date: Mon, 9 Feb 2026 21:38:22 -0800 Subject: [PATCH 2/2] pin ubuntu for now --- .github/workflows/build.yml | 18 +++++++++--------- .github/workflows/pr-check.yml | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 74f5d5a58a3a..147c02593857 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: setup: name: Set up if: github.repository == 'microsoft/vscode-python' - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 defaults: run: shell: python @@ -61,7 +61,7 @@ jobs: - os: windows-latest target: aarch64-pc-windows-msvc vsix-target: win32-arm64 - - os: ubuntu-latest + - os: ubuntu-22.04 target: x86_64-unknown-linux-musl vsix-target: linux-x64 # - os: ubuntu-latest @@ -76,7 +76,7 @@ jobs: # - os: macos-14 # target: aarch64-apple-darwin # vsix-target: darwin-arm64 - - os: ubuntu-latest + - os: ubuntu-22.04 target: x86_64-unknown-linux-musl vsix-target: alpine-x64 # - os: ubuntu-latest @@ -112,7 +112,7 @@ jobs: lint: name: Lint if: github.repository == 'microsoft/vscode-python' - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v6 @@ -127,7 +127,7 @@ jobs: check-types: name: Check Python types if: github.repository == 'microsoft/vscode-python' - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Use Python ${{ env.PYTHON_VERSION }} uses: actions/setup-python@v6 @@ -172,7 +172,7 @@ jobs: matrix: # We're not running CI on macOS for now because it's one less matrix entry to lower the number of runners used, # macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case. - os: [ubuntu-latest, windows-latest] + os: [ubuntu-22.04, windows-latest] # Run the tests on the oldest and most recent versions of Python. python: ['3.9', '3.x', '3.13'] @@ -213,7 +213,7 @@ jobs: # We're not running CI on macOS for now because it's one less matrix # entry to lower the number of runners used, macOS runners are expensive, # and we assume that Ubuntu is enough to cover the UNIX case. - os: [ubuntu-latest, windows-latest] + os: [ubuntu-22.04, windows-latest] python: ['3.x'] test-suite: [ts-unit, venv, single-workspace, multi-workspace, debugger, functional] steps: @@ -374,7 +374,7 @@ jobs: with: run: npm run testSingleWorkspace working-directory: ${{ env.special-working-directory }} - if: matrix.test-suite == 'venv' && matrix.os == 'ubuntu-latest' + if: matrix.test-suite == 'venv' && matrix.os == 'ubuntu-22.04' - name: Run single-workspace tests env: @@ -421,7 +421,7 @@ jobs: include: - os: windows-latest vsix-target: win32-x64 - - os: ubuntu-latest + - os: ubuntu-22.04 vsix-target: linux-x64 steps: diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index d7d8d3869505..5cb0448a8e60 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -34,7 +34,7 @@ jobs: - os: windows-latest target: aarch64-pc-windows-msvc vsix-target: win32-arm64 - - os: ubuntu-latest + - os: ubuntu-22.04 target: x86_64-unknown-linux-musl vsix-target: linux-x64 # - os: ubuntu-latest @@ -49,7 +49,7 @@ jobs: # - os: macos-14 # target: aarch64-apple-darwin # vsix-target: darwin-arm64 - - os: ubuntu-latest + - os: ubuntu-22.04 target: x86_64-unknown-linux-musl vsix-target: alpine-x64 # - os: ubuntu-latest @@ -84,7 +84,7 @@ jobs: lint: name: Lint - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v6 @@ -98,7 +98,7 @@ jobs: check-types: name: Check Python types - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Use Python ${{ env.PYTHON_VERSION }} uses: actions/setup-python@v6 @@ -155,7 +155,7 @@ jobs: matrix: # We're not running CI on macOS for now because it's one less matrix entry to lower the number of runners used, # macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case. - os: [ubuntu-latest, windows-latest] + os: [ubuntu-22.04, windows-latest] # Run the tests on the oldest and most recent versions of Python. python: ['3.9', '3.x', '3.13'] # run for 3 pytest versions, most recent stable, oldest version supported and pre-release pytest-version: ['pytest', 'pytest@pre-release', 'pytest==6.2.0'] @@ -208,7 +208,7 @@ jobs: matrix: # We're not running CI on macOS for now because it's one less matrix entry to lower the number of runners used, # macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case. - os: [ubuntu-latest, windows-latest] + os: [ubuntu-22.04, windows-latest] # Run the tests on the oldest and most recent versions of Python. python: ['3.x'] test-suite: [ts-unit, venv, single-workspace, debugger, functional] @@ -408,7 +408,7 @@ jobs: matrix: # We're not running CI on macOS for now because it's one less matrix entry to lower the number of runners used, # macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case. - os: [ubuntu-latest, windows-latest] + os: [ubuntu-22.04, windows-latest] steps: - name: Checkout @@ -446,7 +446,7 @@ jobs: include: - os: windows-latest vsix-target: win32-x64 - - os: ubuntu-latest + - os: ubuntu-22.04 vsix-target: linux-x64 steps: @@ -484,7 +484,7 @@ jobs: fail-fast: false matrix: # Only run coverage on linux for PRs - os: [ubuntu-latest] + os: [ubuntu-22.04] steps: - name: Checkout