Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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']

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
31 changes: 21 additions & 10 deletions .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:

lint:
name: Lint
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v6
Expand All @@ -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
Expand Down Expand Up @@ -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']
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -477,15 +477,24 @@ jobs:
### Coverage run
coverage:
name: Coverage
# TEMPORARILY DISABLED - hanging in CI, needs investigation
if: false
# The value of runs-on is the OS of the current job (specified in the strategy matrix below) instead of being hardcoded.
runs-on: ${{ matrix.os }}
needs: [lint, check-types, python-tests, tests, native-tests]
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
# Only run coverage on linux for PRs
os: [ubuntu-latest]

os: [ubuntu-22.04]

env:
# Disable D-Bus to avoid "Failed to connect to the bus" errors
DBUS_SESSION_BUS_ADDRESS: /dev/null
# Help with headless environment
ELECTRON_DISABLE_GPU: 1
DONT_PROMPT_WSL_INSTALL: 1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down Expand Up @@ -639,6 +648,7 @@ jobs:
TEST_FILES_SUFFIX: testvirtualenvs
CI_PYTHON_VERSION: ${{ env.PYTHON_VERSION }}
CI_DISABLE_AUTO_SELECTION: 1
DONT_PROMPT_WSL_INSTALL: 1
uses: GabrielBB/xvfb-action@b706e4e27b14669b486812790492dc50ca16b465 # v1.7
with:
run: npm run testSingleWorkspace:cover
Expand All @@ -647,6 +657,7 @@ jobs:
env:
CI_PYTHON_VERSION: ${{ env.PYTHON_VERSION }}
CI_DISABLE_AUTO_SELECTION: 1
DONT_PROMPT_WSL_INSTALL: 1
uses: GabrielBB/xvfb-action@b706e4e27b14669b486812790492dc50ca16b465 # v1.7
with:
run: npm run testSingleWorkspace:cover
Expand Down