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

Merge pull request #14686 from electron/refactor-circle-ci-mac-builds

Browse source 
ci: refactor Mac builds on CircleCI
This commit is contained in:
John Kleinschmidt 2018-09-19 13:50:04 -04:00 • committed by GitHub
commit a6e3466a62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 139 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

256
.circleci/config.yml
View file

@ -35,6 +35,9 @@ env-arm64: &env-arm64
GN_EXTRA_ARGS: 'target_cpu = "arm64" fatal_linker_warnings = false enable_linux_installer = false' GN_EXTRA_ARGS: 'target_cpu = "arm64" fatal_linker_warnings = false enable_linux_installer = false'
MKSNAPSHOT_TOOLCHAIN: //build/toolchain/linux:clang_arm64 MKSNAPSHOT_TOOLCHAIN: //build/toolchain/linux:clang_arm64
env-mas: &env-mas
GN_EXTRA_ARGS: 'is_mas_build = true'
# Individual (shared) steps. # Individual (shared) steps.
step-maybe-notify-slack-failure: &step-maybe-notify-slack-failure step-maybe-notify-slack-failure: &step-maybe-notify-slack-failure
run: run:
@ -58,11 +61,33 @@ step-maybe-notify-slack-success: &step-maybe-notify-slack-success
fi fi
when: on_success when: on_success
step-add-depot-tools-to-path: &step-add-depot-tools-to-path step-checkout-electron: &step-checkout-electron
checkout:
path: src/electron
step-depot-tools-get: &step-depot-tools-get
run:
name: Get depot tools
command: |
git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
step-depot-tools-add-to-path: &step-depot-tools-add-to-path
run: run:
name: Add depot tools to PATH name: Add depot tools to PATH
command: echo 'export PATH="$PATH:'"$PWD"'/depot_tools"' >> $BASH_ENV command: echo 'export PATH="$PATH:'"$PWD"'/depot_tools"' >> $BASH_ENV
step-gclient-sync: &step-gclient-sync
run:
name: Gclient sync
command: |
gclient config \
--name "src/electron" \
--unmanaged \
$GCLIENT_EXTRA_ARGS \
"$CIRCLE_REPOSITORY_URL"
gclient sync --with_branch_heads --with_tags
step-setup-env-for-build: &step-setup-env-for-build step-setup-env-for-build: &step-setup-env-for-build
run: run:
name: Setup Environment Variables name: Setup Environment Variables
@ -74,6 +99,15 @@ step-setup-env-for-build: &step-setup-env-for-build
SCCACHE_PATH="$PWD/src/electron/external_binaries/sccache" SCCACHE_PATH="$PWD/src/electron/external_binaries/sccache"
echo 'export SCCACHE_PATH="'"$SCCACHE_PATH"'"' >> $BASH_ENV echo 'export SCCACHE_PATH="'"$SCCACHE_PATH"'"' >> $BASH_ENV
step-install-nodejs-on-mac: &step-install-nodejs-on-mac
run:
name: Install Node.js 10 on MacOS
command: |
if [ "`uname`" == "Darwin" ]; then
brew update
brew install node@10
fi
step-electron-gn-gen: &step-electron-gn-gen step-electron-gn-gen: &step-electron-gn-gen
run: run:
name: Electron GN gen name: Electron GN gen
@ -118,13 +152,14 @@ step-persist-data-for-tests: &step-persist-data-for-tests
persist_to_workspace: persist_to_workspace:
root: . root: .
paths: paths:
# To run `gn args` for that dir. # To run `gn args` for that dir from the "verify-ffmpeg" script.
- src/out/Default/args.gn - src/out/Default/args.gn
- src/out/Default/build.ninja - src/out/Default/build.ninja
# Build artifacts # Build artifacts
- src/out/Default/dist.zip - src/out/Default/dist.zip
- src/out/Default/gen/node_headers - src/out/Default/gen/node_headers
- src/out/ffmpeg/libffmpeg.dylib
- src/out/ffmpeg/libffmpeg.so - src/out/ffmpeg/libffmpeg.so
step-electron-dist-unzip: &step-electron-dist-unzip step-electron-dist-unzip: &step-electron-dist-unzip
@ -188,7 +223,8 @@ step-maybe-native-mksnapshot-store: &step-maybe-native-mksnapshot-store
step-setup-for-headless-testing: &step-setup-for-headless-testing step-setup-for-headless-testing: &step-setup-for-headless-testing
run: run:
name: Setup for headless testing name: Setup for headless testing
command: sh -e /etc/init.d/xvfb start command: |
sh -e /etc/init.d/xvfb start
step-electron-tests-run: &step-electron-tests-run step-electron-tests-run: &step-electron-tests-run
run: run:
@ -216,13 +252,10 @@ step-show-sccache-stats: &step-show-sccache-stats
# Lists of steps. # Lists of steps.
steps-checkout: &steps-checkout steps-checkout: &steps-checkout
steps: steps:
- checkout: - <<: *step-checkout-electron
path: src/electron - <<: *step-depot-tools-get
- run: - <<: *step-depot-tools-add-to-path
name: Get depot tools
command: |
git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
- <<: *step-add-depot-tools-to-path
- restore_cache: - restore_cache:
paths: paths:
- ~/.gclient-cache - ~/.gclient-cache
@ -230,24 +263,17 @@ steps-checkout: &steps-checkout
- v1-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }} - v1-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
- v1-gclient-cache-{{ arch }}- - v1-gclient-cache-{{ arch }}-
- run: - run:
name: Gclient sync name: Set GIT_CACHE_PATH to make gclient to use the cache
command: | command: |
# CircleCI does not support interpolation when setting environment variables. # CircleCI does not support interpolation when setting environment variables.
# https://circleci.com/docs/2.0/env-vars/#setting-an-environment-variable-in-a-shell-command # https://circleci.com/docs/2.0/env-vars/#setting-an-environment-variable-in-a-shell-command
echo 'export GIT_CACHE_PATH="$HOME/.gclient-cache"' >> $BASH_ENV echo 'export GIT_CACHE_PATH="$HOME/.gclient-cache"' >> $BASH_ENV
source $BASH_ENV - <<: *step-gclient-sync
gclient config \
--name "src/electron" \
--unmanaged \
$GCLIENT_EXTRA_ARGS \
"$CIRCLE_REPOSITORY_URL"
gclient sync --with_branch_heads --with_tags
- save_cache: - save_cache:
paths: paths:
- ~/.gclient-cache - ~/.gclient-cache
key: v1-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }} key: v1-gclient-cache-{{ arch }}-{{ checksum "src/electron/DEPS" }}
- run: - run:
name: Remove some unused data to avoid storing it in the workspace name: Remove some unused data to avoid storing it in the workspace
command: | command: |
@ -264,7 +290,7 @@ steps-debug-build: &steps-debug-build
steps: steps:
- attach_workspace: - attach_workspace:
at: . at: .
- <<: *step-add-depot-tools-to-path - <<: *step-depot-tools-add-to-path
- <<: *step-setup-env-for-build - <<: *step-setup-env-for-build
# Electron app # Electron app
@ -277,7 +303,7 @@ steps-testing-build: &steps-testing-build
steps: steps:
- attach_workspace: - attach_workspace:
at: . at: .
- <<: *step-add-depot-tools-to-path - <<: *step-depot-tools-add-to-path
- <<: *step-setup-env-for-build - <<: *step-setup-env-for-build
# Electron app # Electron app
@ -303,7 +329,7 @@ steps-release-build: &steps-release-build
steps: steps:
- attach_workspace: - attach_workspace:
at: . at: .
- <<: *step-add-depot-tools-to-path - <<: *step-depot-tools-add-to-path
- <<: *step-setup-env-for-build - <<: *step-setup-env-for-build
# Electron app # Electron app
@ -337,7 +363,7 @@ steps-native-tests: &steps-native-tests
steps: steps:
- attach_workspace: - attach_workspace:
at: . at: .
- <<: *step-add-depot-tools-to-path - <<: *step-depot-tools-add-to-path
- <<: *step-setup-env-for-build - <<: *step-setup-env-for-build
- <<: *step-electron-gn-gen - <<: *step-electron-gn-gen
@ -349,7 +375,7 @@ steps-tests: &steps-tests
steps: steps:
- attach_workspace: - attach_workspace:
at: . at: .
- <<: *step-add-depot-tools-to-path - <<: *step-depot-tools-add-to-path
- <<: *step-electron-dist-unzip - <<: *step-electron-dist-unzip
- <<: *step-setup-for-headless-testing - <<: *step-setup-for-headless-testing
@ -358,78 +384,65 @@ steps-tests: &steps-tests
- <<: *step-electron-tests-run - <<: *step-electron-tests-run
- <<: *step-electron-tests-store-results - <<: *step-electron-tests-store-results
# TODO(alexeykuzmin): Use shared build steps defined above for Mac builds. # Mac build are different in a few ways:
mac-build-steps: &mac-build-steps # 1. We can't use save_cache/restore_cache on Mac,
# unpacking with `tar` fails with "Attempt to write to an empty file" error.
# 2. We don't use a shared checkout job because persist_to_workspace
# and attach_workspace take too much time, more than the checkout itself.
steps-build-mac: &steps-build-mac
steps: steps:
- run: - <<: *step-checkout-electron
name: Setup depot tools - <<: *step-depot-tools-get
command: | - <<: *step-depot-tools-add-to-path
git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git - <<: *step-install-nodejs-on-mac
echo 'export PATH="$PATH:'"$PWD"'/depot_tools"' >> $BASH_ENV - <<: *step-gclient-sync
echo 'export GIT_CACHE_PATH="$HOME/.gclient-cache"' >> $BASH_ENV - <<: *step-setup-env-for-build
- run:
name: Install Node.js 10 on MacOS # Electron app
command: | - <<: *step-electron-gn-gen
echo 'Installing Node.js 10 for MacOS' - <<: *step-electron-build
brew update - <<: *step-electron-dist-build
brew install node@10 - <<: *step-electron-dist-store
brew install gnu-tar
echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> $BASH_ENV # ffmpeg
- checkout: - <<: *step-ffmpeg-gn-gen
path: src/electron - <<: *step-ffmpeg-build
- run: - <<: *step-ffmpeg-store
name: Gclient sync
command: | # It would be better to verify ffmpeg as a part of a test job,
gclient config \ # but it requires `gn` to run, and it's complicated
--name "src/electron" \ # to store all gn's dependencies and configs.
--unmanaged \ # FIXME(alexeykuzmin): Enable the next step back.
$GCLIENT_EXTRA_ARGS \ # - <<: *step-verify-ffmpeg
"$CIRCLE_REPOSITORY_URL"
gclient sync --with_branch_heads --with_tags # Node.js headers for tests
- run: - <<: *step-nodejs-headers-build
name: GN gen
command: | - <<: *step-show-sccache-stats
cd src
SCCACHE_PATH="$PWD/electron/external_binaries/sccache" - persist_to_workspace:
echo 'export SCCACHE_WRAPPER="'"$SCCACHE_PATH"'"' >> $BASH_ENV root: .
echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/buildtools"' >> $BASH_ENV paths:
source $BASH_ENV - src/electron
gn gen out/Default --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_PATH"'"'" $GN_EXTRA_ARGS"
- run: # Save all data needed for a further tests run.
name: Ninja build - <<: *step-persist-data-for-tests
command: |
cd src steps-tests-mac: &steps-tests-mac
ninja -C out/Default electron:electron_app steps:
- run: - attach_workspace:
name: Build dist.zip at: .
command: | - <<: *step-depot-tools-add-to-path
cd src - <<: *step-electron-dist-unzip
ninja -C out/Default electron:electron_dist_zip - <<: *step-install-nodejs-on-mac
- run:
name: Check sccache stats after build - <<: *step-electron-tests-run
command: $SCCACHE_WRAPPER -s - <<: *step-electron-tests-store-results
- run:
name: Test filter-only-prs-from-forks: &filter-only-prs-from-forks
environment: filters:
MOCHA_REPORTER: mocha-multi-reporters branches:
MOCHA_FILE: junit/test-results.xml only: /^pull\/.*$/
MOCHA_MULTI_REPORTERS: mocha-junit-reporter, tap
ELECTRON_DISABLE_SECURITY_WARNINGS: 1
command: |
if [ "$RUN_TESTS" != "false" ]; then
cd src
ninja -C out/Default third_party/electron_node:headers
export ELECTRON_OUT_DIR=Default
(cd electron && npm run test -- --ci --enable-logging)
fi
- <<: *step-maybe-notify-slack-failure
- <<: *step-maybe-notify-slack-success
- store_test_results:
path: src/junit
- store_artifacts:
path: src/junit
- store_artifacts:
path: src/out/Default/dist.zip
# List of all jobs. # List of all jobs.
version: 2 version: 2
@ -535,6 +548,19 @@ jobs:
BUILD_NATIVE_MKSNAPSHOT: true BUILD_NATIVE_MKSNAPSHOT: true
<<: *steps-release-build <<: *steps-release-build
osx-testing:
<<: *machine-mac
environment:
<<: *env-testing-build
<<: *steps-build-mac
mas-testing:
<<: *machine-mac
environment:
<<: *env-mas
<<: *env-testing-build
<<: *steps-build-mac
# Layer 3: Tests. # Layer 3: Tests.
linux-x64-native-tests-fyi: linux-x64-native-tests-fyi:
<<: *machine-linux <<: *machine-linux
@ -562,20 +588,13 @@ jobs:
<<: *env-ia32 <<: *env-ia32
<<: *steps-tests <<: *steps-tests
# Mac builds. osx-testing-tests:
# TODO(alexeykuzmin): Use shared configs for them too.
electron-osx-testing:
environment:
GN_CONFIG: //electron/build/args/testing.gn
<<: *machine-mac <<: *machine-mac
<<: *mac-build-steps <<: *steps-tests-mac
electron-mas-testing: mas-testing-tests:
environment:
GN_CONFIG: //electron/build/args/testing.gn
GN_EXTRA_ARGS: 'is_mas_build = true'
<<: *machine-mac <<: *machine-mac
<<: *mac-build-steps <<: *steps-tests-mac
workflows: workflows:
version: 2 version: 2
@ -622,16 +641,19 @@ workflows:
build-mac-fork-prs: build-mac-fork-prs:
jobs: jobs:
- electron-mas-testing: - osx-testing:
filters: <<: *filter-only-prs-from-forks
branches: - osx-testing-tests:
# only from forks <<: *filter-only-prs-from-forks
only: /^pull\/.*$/ requires:
- electron-osx-testing: - osx-testing
filters:
branches: - mas-testing:
# only from forks <<: *filter-only-prs-from-forks
only: /^pull\/.*$/ - mas-testing-tests:
<<: *filter-only-prs-from-forks
requires:
- mas-testing
nightly-release-test: nightly-release-test:
triggers: triggers: