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

build: rename and unify checkout-fast and checkout-and-save-cache (#29138)

Browse source 
Checkout fast was slower and checkout-and-save-cache sometimes didn't save a cache... Basically this unifies our checkout-and-save-cache steps under the existing electron-build command so less steps are duplicated and renames checkout-fast and checkout-and-save-cache to be more aligned with what they actually do.

* `checkout-fast` --> `checkout-for-workspace`: Checks out a fully synced directory and then persists to a workspace layer
* `checkout-and-save-cache` --> `make-src-cache`: Ensures that there is a valid and accurate src cache for this commit.  It doesn't always check it out, sometimes it early outs via the src-cache-marker

Notes: no-notes
This commit is contained in:
Samuel Attard 2021-05-12 18:15:44 -07:00 • committed by GitHub
parent 3869bb2b29
commit 84cc72c415
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 57 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
.circleci/config.yml
View file

@ -1139,49 +1139,6 @@ steps-lint: &steps-lint
cd src/electron
node script/yarn tsc -p tsconfig.script.json
steps-checkout-and-save-cache: &steps-checkout-and-save-cache
steps:
- *step-checkout-electron
- *step-check-for-doc-only-change
- *step-persist-doc-only-change
- *step-maybe-early-exit-doc-only-change
- *step-depot-tools-get
- *step-depot-tools-add-to-path
- *step-restore-brew-cache
- *step-get-more-space-on-mac
- *step-install-gnutar-on-mac
- *step-generate-deps-hash
- *step-touch-sync-done
- maybe-restore-portaled-src-cache:
halt-if-successful: true
- *step-maybe-restore-git-cache
- *step-set-git-cache-path
# This sync call only runs if .circle-sync-done is an EMPTY file
- *step-gclient-sync
- store_artifacts:
path: patches
- *step-save-git-cache
# These next few steps reset Electron to the correct commit regardless of which cache was restored
- run:
name: Wipe Electron
command: rm -rf src/electron
- *step-checkout-electron
- *step-run-electron-only-hooks
- *step-generate-deps-hash-cleanly
- *step-mark-sync-done
- *step-minimize-workspace-size-from-checkout
- *step-delete-git-directories
- run:
name: Move src folder to the cross-OS portal
command: |
sudo mkdir -p /var/portal
sudo chown -R $(id -u):$(id -g) /var/portal
mv ./src /var/portal
- *step-save-src-cache
- *step-make-src-cache-marker
- *step-save-src-cache-marker
steps-electron-gn-check: &steps-electron-gn-check
steps:
- attach_workspace:
@ -1445,6 +1402,12 @@ commands:
checkout-and-assume-cache:
type: boolean
default: false
save-git-cache:
type: boolean
default: false
checkout-to-create-src-cache:
type: boolean
default: false
build:
type: boolean
default: true
@ -1486,13 +1449,18 @@ commands:
- when:
condition: << parameters.restore-src-cache >>
steps:
- maybe-restore-portaled-src-cache
- maybe-restore-portaled-src-cache:
halt-if-successful: << parameters.checkout-to-create-src-cache >>
- *step-maybe-restore-git-cache
- *step-set-git-cache-path
# This sync call only runs if .circle-sync-done is an EMPTY file
- *step-gclient-sync
- store_artifacts:
path: patches
- when:
condition: << parameters.save-git-cache >>
steps:
- *step-save-git-cache
# These next few steps reset Electron to the correct commit regardless of which cache was restored
- run:
name: Wipe Electron
@ -1502,6 +1470,7 @@ commands:
- *step-generate-deps-hash-cleanly
- *step-mark-sync-done
- *step-minimize-workspace-size-from-checkout
- *step-delete-git-directories
- when:
condition: << parameters.persist-checkout >>
steps:
@ -1510,6 +1479,18 @@ commands:
paths:
- depot_tools
- src
- when:
condition: << parameters.checkout-to-create-src-cache >>
steps:
- run:
name: Move src folder to the cross-OS portal
command: |
sudo mkdir -p /var/portal
sudo chown -R $(id -u):$(id -g) /var/portal
mv ./src /var/portal
- *step-save-src-cache
- *step-make-src-cache-marker
- *step-save-src-cache-marker
- when:
condition: << parameters.build >>
@ -1709,7 +1690,7 @@ jobs:
persist-checkout: true
restore-src-cache: false
linux-checkout-fast:
linux-checkout-for-workspace:
executor: linux-docker
environment:
<<: *env-linux-2xlarge
@ -1721,12 +1702,18 @@ jobs:
checkout: true
persist-checkout: true
linux-checkout-and-save-cache:
linux-make-src-cache:
executor: linux-docker
environment:
<<: *env-linux-2xlarge
GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
<<: *steps-checkout-and-save-cache
steps:
- electron-build:
persist: false
build: false
checkout: true
save-git-cache: true
checkout-to-create-src-cache: true
linux-checkout-for-native-tests:
executor: linux-docker
@ -1767,7 +1754,7 @@ jobs:
persist-checkout: true
restore-src-cache: false
mac-checkout-fast:
mac-checkout-for-workspace:
executor: linux-docker
environment:
<<: *env-linux-2xlarge
@ -1781,14 +1768,20 @@ jobs:
checkout: true
persist-checkout: true
mac-checkout-and-save-cache:
mac-make-src-cache:
executor: linux-docker
environment:
<<: *env-linux-2xlarge
<<: *env-testing-build
<<: *env-macos-build
GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
<<: *steps-checkout-and-save-cache
steps:
- electron-build:
persist: false
build: false
checkout: true
save-git-cache: true
checkout-to-create-src-cache: true
# Layer 2: Builds.
linux-x64-testing:
@ -2491,15 +2484,15 @@ workflows:
build-linux:
when: << pipeline.parameters.run-build-linux >>
jobs:
- linux-checkout-fast
- linux-checkout-and-save-cache
- linux-checkout-for-workspace
- linux-make-src-cache
- linux-x64-testing
- linux-x64-testing-asan
- linux-x64-testing-no-run-as-node
- linux-x64-testing-gn-check:
requires:
- linux-checkout-fast
- linux-checkout-for-workspace
- linux-x64-testing-tests:
requires:
- linux-x64-testing
@ -2529,22 +2522,22 @@ workflows:
- linux-arm64-testing
- linux-arm64-testing-gn-check:
requires:
- linux-checkout-fast
- linux-checkout-for-workspace
- ts-compile-doc-change
build-mac:
when: << pipeline.parameters.run-build-mac >>
jobs:
- mac-checkout-fast
- mac-checkout-and-save-cache
- mac-checkout-for-workspace
- mac-make-src-cache
- osx-testing-x64:
requires:
- mac-checkout-and-save-cache
- mac-make-src-cache
- osx-testing-x64-gn-check:
requires:
- mac-checkout-fast
- mac-checkout-for-workspace
- osx-testing-x64-tests:
requires:
@ -2552,7 +2545,7 @@ workflows:
- osx-testing-arm64:
requires:
- mac-checkout-and-save-cache
- mac-make-src-cache
- osx-testing-arm64-tests:
filters:
@ -2564,11 +2557,11 @@ workflows:
- mas-testing-x64:
requires:
- mac-checkout-and-save-cache
- mac-make-src-cache
- mas-testing-x64-gn-check:
requires:
- mac-checkout-fast
- mac-checkout-for-workspace
- mas-testing-x64-tests:
requires:
@ -2576,7 +2569,7 @@ workflows:
- mas-testing-arm64:
requires:
- mac-checkout-and-save-cache
- mac-make-src-cache
- mas-testing-arm64-tests:
filters:
@ -2595,8 +2588,8 @@ workflows:
only:
- master
jobs:
- linux-checkout-fast
- linux-checkout-and-save-cache
- linux-checkout-for-workspace
- linux-make-src-cache
- linux-x64-release
- linux-x64-release-tests: