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.

Sign up for GitHub

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

[ci] Update linux image name from bionic to focal #23173

Merged
merged 2 commits into from
Dec 30, 2024
Merged

[ci] Update linux image name from bionic to focal #23173

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d6927b
CircleCI: Ubuntu used is Focal 20.04, not Bionic 18.04
cclauss Dec 16, 2024
34bbedc
Revert changes to comments
cclauss Dec 16, 2024
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
52 changes: 26 additions & 26 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ executors:
linux-python:
docker:
- image: cimg/python:3.10.7
bionic:
focal:
docker:
- image: emscripten/emscripten-ci:focal
environment:
Expand Down Expand Up @@ -247,7 +247,7 @@ commands:
# detect flakyness.
condition: ${CIRCLE_PULL_REQUEST}
steps:
set-retry-flaky-tests
- set-retry-flaky-tests
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the old version not work?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CircleCI flags this as an incorrect data type error which means it could easily stop working in future releases.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting, but they don't show it as a config error. I wonder why not? LGTM to this part either way.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://circleci.com/docs/vs-code-extension-overview/#config-helper is in-context help..

- run:
name: run tests (<< parameters.title >>)
command: |
Expand Down Expand Up @@ -388,7 +388,7 @@ commands:
# "Firefox is already running, but is not responding."
# TODO: find out a way to shut down and restart firefox
- upload-test-results
test-sockets-chrome:
test-sockets-chrome-command:
cclauss marked this conversation as resolved.
Show resolved Hide resolved
description: "Runs emscripten sockets tests under chrome"
steps:
- prepare-for-tests
Expand All @@ -411,7 +411,7 @@ commands:

jobs:
build-docs:
executor: bionic
executor: focal
steps:
- checkout
- pip-install
Expand All @@ -420,15 +420,15 @@ jobs:
- run: tools/maint/check_emcc_help_text.py
- run: make -C site html
ruff:
executor: bionic
executor: focal
steps:
- checkout
- pip-install
- run: ruff check
# TODO (cclauss): When ruff supports rule E303 without --preview, remove following line
- run: ruff check --preview --select=E303
mypy:
executor: bionic
executor: focal
steps:
- checkout
- pip-install
Expand All @@ -442,13 +442,13 @@ jobs:
npm run lint
npm run check
test-sanity:
executor: bionic
executor: focal
steps:
- run-tests-linux:
frozen_cache: false
test_targets: "sanity"
build-linux:
executor: bionic
executor: focal
# xlarge has 4x the cores of the default medium, costs 4x as much, and runs
# in about 1/2 the time, so it is not cost-effective (overall it is 2x the
# cost for the same work), but given this blocks almost all the other jobs
Expand Down Expand Up @@ -488,19 +488,19 @@ jobs:
- persist
# Perhaps we don't need to run this suite with every commit. Consider moving this to FYI bot.
test-posixtest:
executor: bionic
executor: focal
steps:
- run-tests-linux:
test_targets: "posixtest"
test-core0:
executor: bionic
executor: focal
environment:
EMTEST_SKIP_NODE_CANARY: "1"
steps:
- run-tests-linux:
test_targets: "core0"
test-core2:
executor: bionic
executor: focal
environment:
EMTEST_BROWSER: "node"
EMTEST_SKIP_NODE_CANARY: "1"
Expand Down Expand Up @@ -543,7 +543,7 @@ jobs:
corez.test_dylink_syslibs_all"
- upload-test-results
test-core3:
executor: bionic
executor: focal
environment:
EMTEST_SKIP_NODE_CANARY: "1"
steps:
Expand Down Expand Up @@ -623,12 +623,12 @@ jobs:
test-wasm2js1:
environment:
EMTEST_SKIP_NODE_CANARY: "1"
executor: bionic
executor: focal
steps:
- run-tests-linux:
test_targets: "wasm2js1"
test-wasm64:
# We don't use `bionic` here since its tool old to run recent node versions:
# We don't use `focal` here since its tool old to run recent node versions:
cclauss marked this conversation as resolved.
Show resolved Hide resolved
# `/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found`
executor: linux-python
steps:
Expand Down Expand Up @@ -662,7 +662,7 @@ jobs:
LANG: "C.UTF-8"
# Only run 2 tests at a time to avoid OOM (since each tests used >4gb)
EMCC_CORES: "2"
# We don't use `bionic` here since its too old to run recent node versions:
# We don't use `focal` here since its too old to run recent node versions:
# `/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found`
executor: linux-python
steps:
Expand Down Expand Up @@ -733,7 +733,7 @@ jobs:
core2.test_demangle_stacks_symbol_map"
- upload-test-results
test-node-compat:
# We don't use `bionic` here since its too old to run recent node versions:
# We don't use `focal` here since its too old to run recent node versions:
# `/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found`
executor: linux-python
environment:
Expand Down Expand Up @@ -796,7 +796,7 @@ jobs:
core2.test_pthread_unhandledrejection"
- upload-test-results
test-other:
executor: bionic
executor: focal
environment:
EMTEST_SKIP_NODE_CANARY: "1"
EMTEST_SKIP_RUST: "1"
Expand All @@ -810,7 +810,7 @@ jobs:
# headers on emsdk-bundled clang
test_targets: "other skip:other.test_native_link_error_message"
test-browser-chrome:
executor: bionic
executor: focal
environment:
EMTEST_LACKS_WEBGPU: "1"
steps:
Expand All @@ -821,7 +821,7 @@ jobs:
browser skip:browser.test_4gb_fail
"
test-browser-chrome-wasm64:
executor: bionic
executor: focal
environment:
EMTEST_LACKS_WEBGPU: "1"
steps:
Expand All @@ -836,15 +836,15 @@ jobs:
skip:browser64.test_4gb_fail
skip:browser64.test_4gb"
test-browser-chrome-2gb:
executor: bionic
executor: focal
environment:
EMTEST_LACKS_WEBGPU: "1"
steps:
- run-tests-chrome:
title: "browser_2gb"
test_targets: "browser_2gb"
test-browser-chrome-wasm64-4gb:
executor: bionic
executor: focal
environment:
EMTEST_LACKS_WEBGPU: "1"
EMTEST_SKIP_NODE_CANARY: "1"
Expand All @@ -853,7 +853,7 @@ jobs:
title: "browser64_4gb"
test_targets: "browser64_4gb"
test-browser-firefox:
executor: bionic
executor: focal
steps:
- prepare-for-tests
- run-tests-firefox:
Expand All @@ -876,7 +876,7 @@ jobs:
skip:browser.test_glut_glutget
"
test-browser-firefox-wasm64:
executor: bionic
executor: focal
steps:
- checkout
- run:
Expand All @@ -893,14 +893,14 @@ jobs:
# TODO(sbc): Re-enable once we figure out why the emrun tests are
# locking up.
#test-browser-chrome-emrun:
# executor: bionic
# executor: focal
# steps:
# - run-tests-chrome:
# test_targets: "emrun"
test-sockets-chrome:
executor: bionic
executor: focal
steps:
- test-sockets-chrome
- test-sockets-chrome-command
# windows and mac do not have separate build and test jobs, as they only run
# a limited set of tests; it is simpler and faster to do it all in one job.
test-windows:
Expand Down
Loading