build: drop python2 from CI (#38259)
* build: drop python2 from CI * python3 * python3 uses linux not linux2
This commit is contained in:
parent
9ac4787325
commit
d1c5e623fa
2 changed files with 6 additions and 34 deletions
|
@ -279,7 +279,7 @@ step-gclient-sync: &step-gclient-sync
|
||||||
ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 gclient sync --with_branch_heads --with_tags
|
ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 gclient sync --with_branch_heads --with_tags
|
||||||
if [ "$IS_RELEASE" != "true" ]; then
|
if [ "$IS_RELEASE" != "true" ]; then
|
||||||
# Re-export all the patches to check if there were changes.
|
# Re-export all the patches to check if there were changes.
|
||||||
python src/electron/script/export_all_patches.py src/electron/patches/config.json
|
python3 src/electron/script/export_all_patches.py src/electron/patches/config.json
|
||||||
cd src/electron
|
cd src/electron
|
||||||
git update-index --refresh || true
|
git update-index --refresh || true
|
||||||
if ! git diff-index --quiet HEAD --; then
|
if ! git diff-index --quiet HEAD --; then
|
||||||
|
@ -680,9 +680,9 @@ step-verify-mksnapshot: &step-verify-mksnapshot
|
||||||
if [ "$IS_ASAN" != "1" ]; then
|
if [ "$IS_ASAN" != "1" ]; then
|
||||||
cd src
|
cd src
|
||||||
if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
|
if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
|
||||||
python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --snapshot-files-dir $PWD/cross-arch-snapshots
|
python3 electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --snapshot-files-dir $PWD/cross-arch-snapshots
|
||||||
else
|
else
|
||||||
python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default
|
python3 electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -692,7 +692,7 @@ step-verify-chromedriver: &step-verify-chromedriver
|
||||||
command: |
|
command: |
|
||||||
if [ "$IS_ASAN" != "1" ]; then
|
if [ "$IS_ASAN" != "1" ]; then
|
||||||
cd src
|
cd src
|
||||||
python electron/script/verify-chromedriver.py --source-root "$PWD" --build-dir out/Default
|
python3 electron/script/verify-chromedriver.py --source-root "$PWD" --build-dir out/Default
|
||||||
fi
|
fi
|
||||||
|
|
||||||
step-setup-linux-for-headless-testing: &step-setup-linux-for-headless-testing
|
step-setup-linux-for-headless-testing: &step-setup-linux-for-headless-testing
|
||||||
|
@ -818,7 +818,7 @@ step-maybe-cross-arch-snapshot: &step-maybe-cross-arch-snapshot
|
||||||
elif [ "`uname`" == "Darwin" ]; then
|
elif [ "`uname`" == "Darwin" ]; then
|
||||||
cp "out/Default/$MKSNAPSHOT_PATH/libffmpeg.dylib" out/Default
|
cp "out/Default/$MKSNAPSHOT_PATH/libffmpeg.dylib" out/Default
|
||||||
fi
|
fi
|
||||||
python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --create-snapshot-only
|
python3 electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --create-snapshot-only
|
||||||
mkdir cross-arch-snapshots
|
mkdir cross-arch-snapshots
|
||||||
cp out/Default-mksnapshot-test/*.bin cross-arch-snapshots
|
cp out/Default-mksnapshot-test/*.bin cross-arch-snapshots
|
||||||
# Clean up so that ninja does not get confused
|
# Clean up so that ninja does not get confused
|
||||||
|
@ -975,7 +975,6 @@ step-ts-compile: &step-ts-compile
|
||||||
# List of all steps.
|
# List of all steps.
|
||||||
steps-electron-gn-check: &steps-electron-gn-check
|
steps-electron-gn-check: &steps-electron-gn-check
|
||||||
steps:
|
steps:
|
||||||
- install-python2-mac
|
|
||||||
- *step-setup-goma-for-build
|
- *step-setup-goma-for-build
|
||||||
- checkout-from-cache
|
- checkout-from-cache
|
||||||
- *step-setup-env-for-build
|
- *step-setup-env-for-build
|
||||||
|
@ -994,31 +993,6 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
|
||||||
|
|
||||||
# Command Aliases
|
# Command Aliases
|
||||||
commands:
|
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:
|
maybe-restore-portaled-src-cache:
|
||||||
parameters:
|
parameters:
|
||||||
halt-if-successful:
|
halt-if-successful:
|
||||||
|
@ -1315,7 +1289,6 @@ commands:
|
||||||
- run: rm -rf src/electron
|
- run: rm -rf src/electron
|
||||||
- *step-restore-brew-cache
|
- *step-restore-brew-cache
|
||||||
- *step-install-gnutar-on-mac
|
- *step-install-gnutar-on-mac
|
||||||
- install-python2-mac
|
|
||||||
- *step-save-brew-cache
|
- *step-save-brew-cache
|
||||||
- when:
|
- when:
|
||||||
condition: << parameters.build >>
|
condition: << parameters.build >>
|
||||||
|
@ -1476,7 +1449,6 @@ commands:
|
||||||
- *step-setup-linux-for-headless-testing
|
- *step-setup-linux-for-headless-testing
|
||||||
- *step-restore-brew-cache
|
- *step-restore-brew-cache
|
||||||
- *step-fix-known-hosts-linux
|
- *step-fix-known-hosts-linux
|
||||||
- install-python2-mac
|
|
||||||
- *step-install-signing-cert-on-mac
|
- *step-install-signing-cert-on-mac
|
||||||
|
|
||||||
- run:
|
- run:
|
||||||
|
@ -1577,7 +1549,6 @@ commands:
|
||||||
- *step-depot-tools-get
|
- *step-depot-tools-get
|
||||||
- *step-depot-tools-add-to-path
|
- *step-depot-tools-add-to-path
|
||||||
- *step-restore-brew-cache
|
- *step-restore-brew-cache
|
||||||
- install-python2-mac
|
|
||||||
- *step-get-more-space-on-mac
|
- *step-get-more-space-on-mac
|
||||||
- when:
|
- when:
|
||||||
condition: << parameters.checkout >>
|
condition: << parameters.checkout >>
|
||||||
|
|
|
@ -17,6 +17,7 @@ def main():
|
||||||
chromedriver_name = {
|
chromedriver_name = {
|
||||||
'darwin': 'chromedriver',
|
'darwin': 'chromedriver',
|
||||||
'win32': 'chromedriver.exe',
|
'win32': 'chromedriver.exe',
|
||||||
|
'linux': 'chromedriver',
|
||||||
'linux2': 'chromedriver'
|
'linux2': 'chromedriver'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue