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

Revert "ci: update to Ubuntu 20.04 docker image (#32614)" (#32656)

Browse source 
This reverts commit 8803e7f020.
This commit is contained in:
John Kleinschmidt 2022-01-27 17:45:06 -05:00 committed by GitHub
parent 3768a7b25f
commit 63908ccf89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.circleci/build_config.yml
View file

@ -45,7 +45,7 @@ executors:
type: enum type: enum
enum: ["medium", "xlarge", "2xlarge+"] enum: ["medium", "xlarge", "2xlarge+"]
docker: docker:
- image: ghcr.io/electron/build:e6bebd08a51a0d78ec23e5b3fd7e7c0846412328 - image: ghcr.io/electron/build:27db4a3e3512bfd2e47f58cea69922da0835f1d9
resource_class: << parameters.size >> resource_class: << parameters.size >>
macos: macos:
@ -890,12 +890,12 @@ step-touch-sync-done: &step-touch-sync-done
step-maybe-restore-src-cache: &step-maybe-restore-src-cache step-maybe-restore-src-cache: &step-maybe-restore-src-cache
restore_cache: restore_cache:
keys: keys:
- v10-src-cache-{{ checksum "src/electron/.depshash" }} - v8-src-cache-{{ checksum "src/electron/.depshash" }}
name: Restoring src cache name: Restoring src cache
step-maybe-restore-src-cache-marker: &step-maybe-restore-src-cache-marker step-maybe-restore-src-cache-marker: &step-maybe-restore-src-cache-marker
restore_cache: restore_cache:
keys: keys:
- v3-src-cache-marker-{{ checksum "src/electron/.depshash" }} - v1-src-cache-marker-{{ checksum "src/electron/.depshash" }}
name: Restoring src cache marker name: Restoring src cache marker
# Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
@ -906,8 +906,8 @@ step-maybe-restore-git-cache: &step-maybe-restore-git-cache
paths: paths:
- ~/.gclient-cache - ~/.gclient-cache
keys: keys:
- v3-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }} - v2-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
- v3-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }} - v2-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }}
name: Conditionally restoring git cache name: Conditionally restoring git cache
step-restore-out-cache: &step-restore-out-cache step-restore-out-cache: &step-restore-out-cache
@ -932,7 +932,7 @@ step-save-git-cache: &step-save-git-cache
save_cache: save_cache:
paths: paths:
- ~/.gclient-cache - ~/.gclient-cache
key: v3-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }} key: v2-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
name: Persisting git cache name: Persisting git cache
step-save-out-cache: &step-save-out-cache step-save-out-cache: &step-save-out-cache
@ -977,7 +977,7 @@ step-save-src-cache: &step-save-src-cache
save_cache: save_cache:
paths: paths:
- /var/portal - /var/portal
key: v10-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }} key: v8-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
name: Persisting src cache name: Persisting src cache
step-make-src-cache-marker: &step-make-src-cache-marker step-make-src-cache-marker: &step-make-src-cache-marker
run: run:
@ -987,7 +987,7 @@ step-save-src-cache-marker: &step-save-src-cache-marker
save_cache: save_cache:
paths: paths:
- .src-cache-marker - .src-cache-marker
key: v3-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }} key: v1-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }}
step-maybe-early-exit-no-doc-change: &step-maybe-early-exit-no-doc-change step-maybe-early-exit-no-doc-change: &step-maybe-early-exit-no-doc-change
run: run: