diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index 5a4267189fd66..fcb58d4fd7ffe 100644 --- a/.circleci/config/base.yml +++ b/.circleci/config/base.yml @@ -80,12 +80,14 @@ executors: machine: true linux-arm: - resource_class: electronjs/linux-arm - machine: true + resource_class: electronjs/aks-linux-arm-test + docker: + - image: ghcr.io/electron/test:arm32v7-8e0f85b708fa58e28e4824954d6fd55adfda5e9e linux-arm64: - resource_class: electronjs/linux-arm64 - machine: true + resource_class: electronjs/aks-linux-arm-test + docker: + - image: ghcr.io/electron/test:arm64v8-76d5d29e247972da3855a01c2d8cf72c5998233a # The config expects the following environment variables to be set: # - "SLACK_WEBHOOK" Slack hook URL to send notifications. @@ -1656,17 +1658,15 @@ commands: export LLVM_SYMBOLIZER_PATH=$PWD/third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer export MOCHA_TIMEOUT=180000 echo "Piping output to ASAN_SYMBOLIZE ($ASAN_SYMBOLIZE)" - (cd electron && (circleci tests glob "spec/*-spec.ts" | circleci tests run --command="xargs node script/yarn test --runners=main --trace-uncaught --enable-logging --files" --split-by=timings 2>&1)) | $ASAN_SYMBOLIZE + (cd electron && (circleci tests glob "spec/*-spec.ts" | xargs -I@ -P4 bash -c "echo $(pwd)/@" | circleci tests run --command="xargs node script/yarn test --runners=main --trace-uncaught --enable-logging --files" --split-by=timings 2>&1)) | $ASAN_SYMBOLIZE else if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then export ELECTRON_SKIP_NATIVE_MODULE_TESTS=true - (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging) - else - if [ "$TARGET_ARCH" == "ia32" ]; then - npm_config_arch=x64 node electron/node_modules/dugite/script/download-git.js - fi - (cd electron && (circleci tests glob "spec/*-spec.ts" | circleci tests run --command="xargs node script/yarn test --runners=main --trace-uncaught --enable-logging --files" --split-by=timings)) fi + if [ "$TARGET_ARCH" == "ia32" ]; then + npm_config_arch=x64 node electron/node_modules/dugite/script/download-git.js + fi + (cd electron && (circleci tests glob "spec/*-spec.ts" | xargs -I@ -P4 bash -c "echo $(pwd)/@" | circleci tests run --command="xargs node script/yarn test --runners=main --trace-uncaught --enable-logging --files" --split-by=timings)) fi - store_test_results: path: src/junit @@ -2296,6 +2296,7 @@ jobs: <<: *env-global <<: *env-headless-testing <<: *env-stack-dumping + parallelism: 3 steps: - electron-tests: artifact-key: linux-arm @@ -2307,6 +2308,7 @@ jobs: <<: *env-global <<: *env-headless-testing <<: *env-stack-dumping + parallelism: 3 steps: - electron-tests: artifact-key: linux-arm64 diff --git a/spec/api-content-tracing-spec.ts b/spec/api-content-tracing-spec.ts index 850cf98f4b492..a9b55922ae8b4 100644 --- a/spec/api-content-tracing-spec.ts +++ b/spec/api-content-tracing-spec.ts @@ -71,7 +71,7 @@ ifdescribe(!(['arm', 'arm64'].includes(process.arch)) || (process.platform !== ' // If the `categoryFilter` param above is not respected // the file size will be above 50KB. const fileSizeInKiloBytes = getFileSizeInKiloBytes(outputFilePath); - const expectedMaximumFileSize = 10; // Depends on a platform. + const expectedMaximumFileSize = 50; // Depends on a platform. expect(fileSizeInKiloBytes).to.be.above(0, `the trace output file is empty, check "${outputFilePath}"`);