|
@@ -53,14 +53,8 @@ executors:
|
|
|
description: "macOS executor size"
|
|
|
type: enum
|
|
|
enum: ["macos.x86.medium.gen2", "large"]
|
|
|
- xcode:
|
|
|
- description: "xcode version"
|
|
|
- default: 13.2.1
|
|
|
- type: enum
|
|
|
- enum: ["12.4.0", "13.2.1"]
|
|
|
-
|
|
|
macos:
|
|
|
- xcode: << parameters.xcode >>
|
|
|
+ xcode: 13.3.0
|
|
|
resource_class: << parameters.size >>
|
|
|
|
|
|
# Electron Runners
|
|
@@ -131,6 +125,9 @@ env-apple-silicon: &env-apple-silicon
|
|
|
USE_PREBUILT_V8_CONTEXT_SNAPSHOT: 1
|
|
|
npm_config_arch: arm64
|
|
|
|
|
|
+env-runner: &env-runner
|
|
|
+ IS_ELECTRON_RUNNER: 1
|
|
|
+
|
|
|
env-arm64: &env-arm64
|
|
|
GN_EXTRA_ARGS: 'target_cpu = "arm64" fatal_linker_warnings = false enable_linux_installer = false'
|
|
|
MKSNAPSHOT_TOOLCHAIN: //build/toolchain/linux:clang_arm64
|
|
@@ -498,6 +495,7 @@ step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
|
|
|
name: Import and trust self-signed codesigning cert on MacOS
|
|
|
command: |
|
|
|
if [ "$TARGET_ARCH" != "arm64" ] && [ "`uname`" == "Darwin" ]; then
|
|
|
+ sudo security authorizationdb write com.apple.trust-settings.admin allow
|
|
|
cd src/electron
|
|
|
./script/codesign/generate-identity.sh
|
|
|
fi
|
|
@@ -628,7 +626,7 @@ step-electron-publish: &step-electron-publish
|
|
|
echo 'Uploading Electron release distribution to Azure'
|
|
|
script/release/uploaders/upload.py --verbose --UPLOAD_TO_STORAGE
|
|
|
else
|
|
|
- echo 'Uploading Electron release distribution to Github releases'
|
|
|
+ echo 'Uploading Electron release distribution to GitHub releases'
|
|
|
script/release/uploaders/upload.py --verbose
|
|
|
fi
|
|
|
|
|
@@ -997,6 +995,7 @@ steps-electron-gn-check: &steps-electron-gn-check
|
|
|
- *step-checkout-electron
|
|
|
- *step-depot-tools-get
|
|
|
- *step-depot-tools-add-to-path
|
|
|
+ - install-python2-mac
|
|
|
- *step-setup-env-for-build
|
|
|
- *step-setup-goma-for-build
|
|
|
- *step-generate-deps-hash
|
|
@@ -1101,6 +1100,7 @@ steps-tests: &steps-tests
|
|
|
- *step-setup-linux-for-headless-testing
|
|
|
- *step-restore-brew-cache
|
|
|
- *step-fix-known-hosts-linux
|
|
|
+ - install-python2-mac
|
|
|
- *step-install-signing-cert-on-mac
|
|
|
|
|
|
- run:
|
|
@@ -1190,6 +1190,31 @@ steps-test-node: &steps-test-node
|
|
|
|
|
|
# Command Aliases
|
|
|
commands:
|
|
|
+ install-python2-mac:
|
|
|
+ steps:
|
|
|
+ - restore_cache:
|
|
|
+ keys:
|
|
|
+ - v2.7.18-python-cache-{{ arch }}
|
|
|
+ name: Restore python cache
|
|
|
+ - run:
|
|
|
+ name: Install python2 on macos
|
|
|
+ command: |
|
|
|
+ if [ "`uname`" == "Darwin" ] && [ "$IS_ELECTRON_RUNNER" != "1" ]; then
|
|
|
+ if [ ! -f "python-downloads/python-2.7.18-macosx10.9.pkg" ]; then
|
|
|
+ mkdir python-downloads
|
|
|
+ echo 'Downloading Python 2.7.18'
|
|
|
+ curl -O https://dev-cdn.electronjs.org/python/python-2.7.18-macosx10.9.pkg
|
|
|
+ mv python-2.7.18-macosx10.9.pkg python-downloads
|
|
|
+ else
|
|
|
+ echo 'Using Python install from cache'
|
|
|
+ fi
|
|
|
+ sudo installer -pkg python-downloads/python-2.7.18-macosx10.9.pkg -target /
|
|
|
+ fi
|
|
|
+ - save_cache:
|
|
|
+ paths:
|
|
|
+ - python-downloads
|
|
|
+ key: v2.7.18-python-cache-{{ arch }}
|
|
|
+ name: Persisting python cache
|
|
|
maybe-restore-portaled-src-cache:
|
|
|
parameters:
|
|
|
halt-if-successful:
|
|
@@ -1357,6 +1382,7 @@ commands:
|
|
|
- run: rm -rf src/electron
|
|
|
- *step-restore-brew-cache
|
|
|
- *step-install-gnutar-on-mac
|
|
|
+ - install-python2-mac
|
|
|
- *step-save-brew-cache
|
|
|
- when:
|
|
|
condition: << parameters.build >>
|
|
@@ -1548,6 +1574,7 @@ commands:
|
|
|
- *step-depot-tools-get
|
|
|
- *step-depot-tools-add-to-path
|
|
|
- *step-restore-brew-cache
|
|
|
+ - install-python2-mac
|
|
|
- *step-get-more-space-on-mac
|
|
|
- when:
|
|
|
condition: << parameters.checkout >>
|
|
@@ -1607,7 +1634,7 @@ jobs:
|
|
|
name: linux-docker
|
|
|
size: medium
|
|
|
environment:
|
|
|
- <<: *env-linux-medium
|
|
|
+ <<: *env-linux-2xlarge
|
|
|
<<: *env-testing-build
|
|
|
GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
|
|
|
<<: *steps-electron-ts-compile-for-doc-change
|
|
@@ -2180,7 +2207,6 @@ jobs:
|
|
|
osx-testing-x64-tests:
|
|
|
executor:
|
|
|
name: macos
|
|
|
- xcode: 12.4.0
|
|
|
size: macos.x86.medium.gen2
|
|
|
environment:
|
|
|
<<: *env-mac-large
|
|
@@ -2194,12 +2220,12 @@ jobs:
|
|
|
<<: *env-mac-large
|
|
|
<<: *env-stack-dumping
|
|
|
<<: *env-apple-silicon
|
|
|
+ <<: *env-runner
|
|
|
<<: *steps-tests
|
|
|
|
|
|
mas-testing-x64-tests:
|
|
|
executor:
|
|
|
name: macos
|
|
|
- xcode: 12.4.0
|
|
|
size: macos.x86.medium.gen2
|
|
|
environment:
|
|
|
<<: *env-mac-large
|
|
@@ -2213,6 +2239,7 @@ jobs:
|
|
|
<<: *env-mac-large
|
|
|
<<: *env-stack-dumping
|
|
|
<<: *env-apple-silicon
|
|
|
+ <<: *env-runner
|
|
|
<<: *steps-tests
|
|
|
|
|
|
# Layer 4: Summary.
|