From 71fff6ea0ef91679b2eb2637d60b40484bac4176 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Mon, 31 May 2021 16:20:40 -0700 Subject: [PATCH] build: merge chromedriver gen and build (#29439) --- .circleci/config.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5618adce582..0ff0e2f86f0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -597,21 +597,13 @@ step-electron-dist-build: &step-electron-dist-build fi fi -step-electron-maybe-chromedriver-gn-gen: &step-electron-maybe-chromedriver-gn-gen - run: - name: chromedriver GN gen - command: | - cd src - if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then - gn gen out/chromedriver --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS" - fi - step-electron-chromedriver-build: &step-electron-chromedriver-build run: name: Build chromedriver.zip command: | cd src if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then + gn gen out/chromedriver --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS" export CHROMEDRIVER_DIR="out/chromedriver" else export CHROMEDRIVER_DIR="out/Default" @@ -1528,7 +1520,6 @@ commands: - *step-maybe-cross-arch-snapshot # chromedriver - - *step-electron-maybe-chromedriver-gn-gen - *step-electron-chromedriver-build - when: @@ -1628,7 +1619,6 @@ commands: - *step-mksnapshot-build # chromedriver - - *step-electron-maybe-chromedriver-gn-gen - *step-electron-chromedriver-build # Node.js headers