Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: merge chromedriver gen and build #29439

Merged
merged 1 commit into from May 31, 2021
Merged

build: merge chromedriver gen and build #29439

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 1 addition & 11 deletions .circleci/config.yml
View file
Open in desktop
Expand Up @@ -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"
Expand Down Expand Up @@ -1528,7 +1520,6 @@ commands:
- *step-maybe-cross-arch-snapshot

# chromedriver
- *step-electron-maybe-chromedriver-gn-gen
- *step-electron-chromedriver-build

- when:
Expand Down Expand Up @@ -1628,7 +1619,6 @@ commands:
- *step-mksnapshot-build

# chromedriver
- *step-electron-maybe-chromedriver-gn-gen
- *step-electron-chromedriver-build

# Node.js headers
Expand Down