From 6d6927be49a9270a0753e9357a664bef9fae43d3 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 16 Dec 2024 14:52:31 +0100 Subject: [PATCH 1/2] CircleCI: Ubuntu used is Focal 20.04, not Bionic 18.04 --- .circleci/config.yml | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 61d7cb912a278..034d9d5bf957a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ executors: linux-python: docker: - image: cimg/python:3.10.7 - bionic: + focal: docker: - image: emscripten/emscripten-ci:focal environment: @@ -247,7 +247,7 @@ commands: # detect flakyness. condition: ${CIRCLE_PULL_REQUEST} steps: - set-retry-flaky-tests + - set-retry-flaky-tests - run: name: run tests (<< parameters.title >>) command: | @@ -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: description: "Runs emscripten sockets tests under chrome" steps: - prepare-for-tests @@ -411,7 +411,7 @@ commands: jobs: build-docs: - executor: bionic + executor: focal steps: - checkout - pip-install @@ -420,7 +420,7 @@ jobs: - run: tools/maint/check_emcc_help_text.py - run: make -C site html ruff: - executor: bionic + executor: focal steps: - checkout - pip-install @@ -428,7 +428,7 @@ jobs: # 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 @@ -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 @@ -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" @@ -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: @@ -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: # `/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found` executor: linux-python steps: @@ -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: @@ -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: @@ -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" @@ -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: @@ -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: @@ -836,7 +836,7 @@ jobs: skip:browser64.test_4gb_fail skip:browser64.test_4gb" test-browser-chrome-2gb: - executor: bionic + executor: focal environment: EMTEST_LACKS_WEBGPU: "1" steps: @@ -844,7 +844,7 @@ jobs: 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" @@ -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: @@ -876,7 +876,7 @@ jobs: skip:browser.test_glut_glutget " test-browser-firefox-wasm64: - executor: bionic + executor: focal steps: - checkout - run: @@ -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: From 34bbedc1381f6ba98ad2af1cce4b6d35a4b02fbe Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 16 Dec 2024 18:43:48 +0100 Subject: [PATCH 2/2] Revert changes to comments --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 034d9d5bf957a..a111ab9a9593f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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-command: + test-sockets-chrome: description: "Runs emscripten sockets tests under chrome" steps: - prepare-for-tests @@ -628,7 +628,7 @@ jobs: - run-tests-linux: test_targets: "wasm2js1" test-wasm64: - # We don't use `focal` here since its tool old to run recent node versions: + # We don't use `bionic` here since its tool old to run recent node versions: # `/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found` executor: linux-python steps: @@ -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 `focal` here since its too old to run recent node versions: + # We don't use `bionic` 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: @@ -733,7 +733,7 @@ jobs: core2.test_demangle_stacks_symbol_map" - upload-test-results test-node-compat: - # We don't use `focal` here since its too old to run recent node versions: + # We don't use `bionic` 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: @@ -900,7 +900,7 @@ jobs: test-sockets-chrome: executor: focal steps: - - test-sockets-chrome-command + - test-sockets-chrome # 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: