Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DO NOT MERGE - Tami takamiya/ubuntu 24.04 #1494

Closed
wants to merge 4 commits into from
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
12 changes: 7 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
run:
shell: ${{ matrix.shell || 'bash'}}
# The type of runner that the job will run on
runs-on: ${{ matrix.os || 'ubuntu-22.04' }}
runs-on: ${{ matrix.os || 'ubuntu-24.04' }}
# see https://github.com/containers/podman/issues/13609
continue-on-error: ${{ contains(matrix.name, 'macos') && true || false }}
outputs:
Expand All @@ -75,15 +75,15 @@ jobs:
continue-on-error:
- false
os:
- ubuntu-22.04
- ubuntu-24.04
task-name:
- docs
name:
- docs
include:
- name: lint
task-name: lint
os: ubuntu-22.04
os: ubuntu-24.04
env:
SKIP_PODMAN: 1
SKIP_DOCKER: 1
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
if: contains(matrix.shell, 'wsl')
uses: Vampire/setup-wsl@v3.1.1
with:
distribution: Ubuntu-22.04
distribution: Ubuntu-24.04
set-as-default: "true"
# '-i' seems to be the only option that loads .bashrc file that we need
# https://github.com/Vampire/setup-wsl/discussions/54
Expand All @@ -144,6 +144,7 @@ jobs:
dbus
dirmngr
gawk
gcc
git
gpg
gpg-agent
Expand Down Expand Up @@ -294,6 +295,7 @@ jobs:
out/log
out/test-resources/settings/logs
out/userdata/logs
"${HOME}/.config/Code/logs"
if-no-files-found: ignore
retention-days: 90

Expand Down Expand Up @@ -332,7 +334,7 @@ jobs:
id-token: write
checks: read

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Merge logs into a single archive
Expand Down
4 changes: 2 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ submodules:
recursive: true

build:
os: ubuntu-22.04
os: ubuntu-24.04
tools:
python: >- # PyYAML parses it as float `3.1` it it's not an explicit string
3.10
3.12

# Optionally set the version of Python and requirements required
# to build docs
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,7 @@
"test-ui-current": "CODE_VERSION='max' yarn _test-ui",
"test-ui-oldest": "CODE_VERSION='min' yarn _test-ui",
"test-ui-with-mock-lightspeed-server": "TEST_LIGHTSPEED_URL='http://127.0.0.1:3000' ./tools/run-ui-test-with-mock-lightspeed-server.sh",
"_coverage-ui": "extest get-vscode -c ${CODE_VERSION} -s out/test-resources && extest get-chromedriver -c ${CODE_VERSION} -s out/test-resources && extest install-from-marketplace redhat.vscode-yaml ms-python.python -e out/ext -s out/test-resources && extest run-tests --coverage -s out/test-resources -e out/ext --code_settings test/testFixtures/settings.json out/client/test/ui-test/allTestsSuite.js",
"_coverage-ui": "extest get-vscode -c ${CODE_VERSION} -s out/test-resources && extest get-chromedriver -c ${CODE_VERSION} -s out/test-resources && extest install-from-marketplace redhat.vscode-yaml ms-python.python -e out/ext -s out/test-resources && extest run-tests --log_level Debug --coverage -s out/test-resources -e out/ext --code_settings test/testFixtures/settings.json out/client/test/ui-test/allTestsSuite.js",
"coverage-ui-current": "COVERAGE=1 CODE_VERSION='max' yarn _coverage-ui",
"coverage-ui-oldest": "COVERAGE=1 CODE_VERSION='min' yarn _coverage-ui",
"_coverage-ui-with-mock-lightspeed-server": "./tools/run-ui-test-with-mock-lightspeed-server.sh --coverage",
Expand Down
Loading