From 6cb2b9eab7e04d5b08ed0a75a78c5c6a28d4f1d0 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Tue, 24 May 2022 14:04:49 -0700 Subject: [PATCH] build: do not checkout chromium for ts docs check (#34331) --- .circleci/config/base.yml | 52 ++++++++++++++------------------------- yarn.lock | 7 +++--- 2 files changed, 21 insertions(+), 38 deletions(-) diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml index 454a7a59152b..a579069c96e9 100644 --- a/.circleci/config/base.yml +++ b/.circleci/config/base.yml @@ -473,6 +473,13 @@ step-install-npm-deps-on-mac: &step-install-npm-deps-on-mac node script/yarn install fi +step-install-npm-deps: &step-install-npm-deps + run: + name: Install node_modules + command: | + cd src/electron + node script/yarn install --frozen-lockfile + # This step handles the differences between the linux "gclient sync" # and the expected state on macOS step-fix-sync: &step-fix-sync @@ -987,9 +994,16 @@ step-ts-compile: &step-ts-compile run: name: Run TS/JS compile on doc only change command: | - cd src - ninja -C out/Default electron:default_app_js -j $NUMBER_OF_NINJA_PROCESSES - ninja -C out/Default electron:electron_js2c -j $NUMBER_OF_NINJA_PROCESSES + cd src/electron + node script/yarn create-typescript-definitions + node script/yarn tsc -p tsconfig.default_app.json --noEmit + for f in build/webpack/*.js + do + out="${f:29}" + if [ "$out" != "base.js" ]; then + node script/yarn webpack --config $f --output-filename=$out --output-path=./.tmp --env.mode=development + fi + done # List of all steps. steps-electron-gn-check: &steps-electron-gn-check @@ -1011,37 +1025,7 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha steps: # Checkout - Copied from steps-checkout - *step-checkout-electron - - *step-depot-tools-get - - *step-depot-tools-add-to-path - - *step-restore-brew-cache - - *step-install-gnutar-on-mac - - *step-install-python2-on-mac - - *step-get-more-space-on-mac - - *step-setup-goma-for-build - - *step-generate-deps-hash - - *step-touch-sync-done - - maybe-restore-portaled-src-cache - - *step-maybe-restore-git-cache - - *step-set-git-cache-path - # This sync call only runs if .circle-sync-done is an EMPTY file - - *step-gclient-sync - # These next few steps reset Electron to the correct commit regardless of which cache was restored - - run: - name: Wipe Electron - command: rm -rf src/electron - - *step-checkout-electron - - *step-run-electron-only-hooks - - *step-generate-deps-hash-cleanly - - *step-mark-sync-done - - *step-minimize-workspace-size-from-checkout - - - *step-depot-tools-add-to-path - - *step-setup-env-for-build - - *step-wait-for-goma - - *step-get-more-space-on-mac - - *step-install-npm-deps-on-mac - - *step-fix-sync - - *step-gn-gen-default + - *step-install-npm-deps #Compile ts/js to verify doc change didn't break anything - *step-ts-compile diff --git a/yarn.lock b/yarn.lock index ca7df59b03cf..226aae6f5b92 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5050,10 +5050,9 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nan@^2.12.1: - version "2.14.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" - integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== +nan@^2.12.1, nan@nodejs/nan#16fa32231e2ccd89d2804b3f765319128b20c4ac: + version "2.15.0" + resolved "https://codeload.github.com/nodejs/nan/tar.gz/16fa32231e2ccd89d2804b3f765319128b20c4ac" nanomatch@^1.2.9: version "1.2.13"