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

build: unify machine-mac-large-arm and machine-mac-large (#28700)

Browse source
This commit is contained in:
Samuel Attard 2021-04-19 11:32:57 -07:00 • committed by GitHub
parent 6327a5a4a2
commit ac9ec1a6ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.circleci/config.yml
View file

@ -92,11 +92,6 @@ machine-mac-large: &machine-mac-large
macos:
xcode: "12.4.0"
machine-mac-large-arm: &machine-mac-large-arm
resource_class: large
macos:
xcode: "12.4.0"
machine-mac-arm64: &machine-mac-arm64
resource_class: electronjs/macos-arm64
machine: true
@ -2119,7 +2114,7 @@ jobs:
checkout: true
osx-publish-arm64:
<<: *machine-mac-large-arm
<<: *machine-mac-large
environment:
<<: *env-mac-large-release
<<: *env-release-build
@ -2144,7 +2139,7 @@ jobs:
checkout: false
osx-publish-arm64-skip-checkout:
<<: *machine-mac-large-arm
<<: *machine-mac-large
environment:
<<: *env-mac-large-release
<<: *env-release-build
@ -2157,7 +2152,7 @@ jobs:
checkout: false
osx-testing-arm64:
<<: *machine-mac-large-arm
<<: *machine-mac-large
environment:
<<: *env-mac-large
<<: *env-testing-build
@ -2226,7 +2221,7 @@ jobs:
checkout: true
mas-publish-arm64:
<<: *machine-mac-large-arm
<<: *machine-mac-large
environment:
<<: *env-mac-large-release
<<: *env-mas-apple-silicon
@ -2251,7 +2246,7 @@ jobs:
checkout: false
mas-publish-arm64-skip-checkout:
<<: *machine-mac-large-arm
<<: *machine-mac-large
environment:
<<: *env-mac-large-release
<<: *env-mas-apple-silicon
@ -2264,7 +2259,7 @@ jobs:
checkout: false
mas-testing-arm64:
<<: *machine-mac-large-arm
<<: *machine-mac-large
environment:
<<: *env-mac-large
<<: *env-testing-build