mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

build: merge chromedriver gen and build (#29439)

Browse source
This commit is contained in:
Samuel Attard 2021-05-31 16:20:40 -07:00 committed by GitHub
parent 73adee6d53
commit 71fff6ea0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.circleci/config.yml
View file

@ -597,21 +597,13 @@ step-electron-dist-build: &step-electron-dist-build
fi fi
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 step-electron-chromedriver-build: &step-electron-chromedriver-build
run: run:
name: Build chromedriver.zip name: Build chromedriver.zip
command: | command: |
cd src cd src
if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then 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" export CHROMEDRIVER_DIR="out/chromedriver"
else else
export CHROMEDRIVER_DIR="out/Default" export CHROMEDRIVER_DIR="out/Default"
@ -1528,7 +1520,6 @@ commands:
- *step-maybe-cross-arch-snapshot - *step-maybe-cross-arch-snapshot
# chromedriver # chromedriver
- *step-electron-maybe-chromedriver-gn-gen
- *step-electron-chromedriver-build - *step-electron-chromedriver-build
- when: - when:
@ -1628,7 +1619,6 @@ commands:
- *step-mksnapshot-build - *step-mksnapshot-build
# chromedriver # chromedriver
- *step-electron-maybe-chromedriver-gn-gen
- *step-electron-chromedriver-build - *step-electron-chromedriver-build
# Node.js headers # Node.js headers