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

ci: rename Electron build step to include type of build being built (#37371)

Browse source 
ci: rename Electron build step to describe what is being built
This commit is contained in:
John Kleinschmidt 2023-02-23 21:13:54 -05:00 • committed by GitHub
parent e27905c765
commit 73bd9a3155
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

35
.circleci/config/base.yml
View file

@ -1054,6 +1054,8 @@ commands:
parameters: parameters:
artifact-key: artifact-key:
type: string type: string
build-type:
type: string
build-nonproprietary-ffmpeg: build-nonproprietary-ffmpeg:
type: boolean type: boolean
default: true default: true
@ -1061,6 +1063,7 @@ commands:
- *step-gn-gen-default - *step-gn-gen-default
- ninja_build_electron: - ninja_build_electron:
clean-prebuilt-snapshot: false clean-prebuilt-snapshot: false
build-type: << parameters.build-type >>
- *step-maybe-electron-dist-strip - *step-maybe-electron-dist-strip
- step-electron-dist-build: - step-electron-dist-build:
additional-targets: shell_browser_ui_unittests third_party/electron_node:headers third_party/electron_node:overlapped-checker electron:hunspell_dictionaries_zip additional-targets: shell_browser_ui_unittests third_party/electron_node:headers third_party/electron_node:overlapped-checker electron:hunspell_dictionaries_zip
@ -1222,9 +1225,12 @@ commands:
clean-prebuilt-snapshot: clean-prebuilt-snapshot:
type: boolean type: boolean
default: true default: true
build-type:
type: string
steps: steps:
- run: - run:
name: Electron build name: Electron << parameters.build-type >> build
no_output_timeout: 60m no_output_timeout: 60m
command: | command: |
cd src cd src
@ -1292,6 +1298,8 @@ commands:
default: true default: true
artifact-key: artifact-key:
type: string type: string
build-type:
type: string
after-build-and-save: after-build-and-save:
type: steps type: steps
default: [] default: []
@ -1418,6 +1426,7 @@ commands:
steps: steps:
- build_and_save_artifacts: - build_and_save_artifacts:
artifact-key: << parameters.artifact-key >> artifact-key: << parameters.artifact-key >>
build-type: << parameters.build-type >>
build-nonproprietary-ffmpeg: << parameters.build-nonproprietary-ffmpeg >> build-nonproprietary-ffmpeg: << parameters.build-nonproprietary-ffmpeg >>
- steps: << parameters.after-build-and-save >> - steps: << parameters.after-build-and-save >>
@ -1563,6 +1572,8 @@ commands:
checkout: checkout:
type: boolean type: boolean
default: true default: true
build-type:
type: string
steps: steps:
- when: - when:
condition: << parameters.attach >> condition: << parameters.attach >>
@ -1594,7 +1605,8 @@ commands:
- *step-gn-gen-default - *step-gn-gen-default
# Electron app # Electron app
- ninja_build_electron - ninja_build_electron:
build-type: << parameters.build-type >>
- *step-show-goma-stats - *step-show-goma-stats
- *step-maybe-generate-breakpad-symbols - *step-maybe-generate-breakpad-symbols
- *step-maybe-electron-dist-strip - *step-maybe-electron-dist-strip
@ -1657,6 +1669,7 @@ jobs:
save-git-cache: true save-git-cache: true
checkout-to-create-src-cache: true checkout-to-create-src-cache: true
artifact-key: 'nil' artifact-key: 'nil'
build-type: 'nil'
mac-checkout: mac-checkout:
executor: executor:
@ -1675,6 +1688,7 @@ jobs:
persist-checkout: true persist-checkout: true
restore-src-cache: false restore-src-cache: false
artifact-key: 'nil' artifact-key: 'nil'
build-type: 'nil'
mac-make-src-cache: mac-make-src-cache:
executor: executor:
@ -1693,6 +1707,7 @@ jobs:
save-git-cache: true save-git-cache: true
checkout-to-create-src-cache: true checkout-to-create-src-cache: true
artifact-key: 'nil' artifact-key: 'nil'
build-type: 'nil'
# Layer 2: Builds. # Layer 2: Builds.
linux-x64-testing: linux-x64-testing:
@ -1710,6 +1725,7 @@ jobs:
checkout: false checkout: false
checkout-and-assume-cache: true checkout-and-assume-cache: true
artifact-key: 'linux-x64' artifact-key: 'linux-x64'
build-type: 'Linux'
linux-x64-testing-asan: linux-x64-testing-asan:
executor: executor:
@ -1728,6 +1744,7 @@ jobs:
checkout: true checkout: true
build-nonproprietary-ffmpeg: false build-nonproprietary-ffmpeg: false
artifact-key: 'linux-x64-asan' artifact-key: 'linux-x64-asan'
build-type: 'Linux'
linux-x64-testing-no-run-as-node: linux-x64-testing-no-run-as-node:
executor: executor:
@ -1744,6 +1761,7 @@ jobs:
persist: false persist: false
checkout: true checkout: true
artifact-key: 'linux-x64-no-run-as-node' artifact-key: 'linux-x64-no-run-as-node'
build-type: 'Linux'
linux-x64-testing-gn-check: linux-x64-testing-gn-check:
executor: executor:
@ -1775,6 +1793,7 @@ jobs:
- electron-publish: - electron-publish:
attach: false attach: false
checkout: true checkout: true
build-type: 'Linux'
linux-arm-testing: linux-arm-testing:
@ -1795,6 +1814,7 @@ jobs:
checkout: false checkout: false
checkout-and-assume-cache: true checkout-and-assume-cache: true
artifact-key: 'linux-arm' artifact-key: 'linux-arm'
build-type: 'Linux ARM'
linux-arm-publish: linux-arm-publish:
executor: executor:
@ -1819,6 +1839,7 @@ jobs:
- electron-publish: - electron-publish:
attach: false attach: false
checkout: true checkout: true
build-type: 'Linux ARM'
linux-arm64-testing: linux-arm64-testing:
executor: executor:
@ -1838,6 +1859,7 @@ jobs:
checkout: false checkout: false
checkout-and-assume-cache: true checkout-and-assume-cache: true
artifact-key: 'linux-arm64' artifact-key: 'linux-arm64'
build-type: 'Linux ARM64'
linux-arm64-testing-gn-check: linux-arm64-testing-gn-check:
executor: executor:
@ -1872,6 +1894,7 @@ jobs:
- electron-publish: - electron-publish:
attach: false attach: false
checkout: true checkout: true
build-type: 'Linux ARM64'
osx-testing-x64: osx-testing-x64:
executor: executor:
@ -1890,6 +1913,7 @@ jobs:
checkout-and-assume-cache: true checkout-and-assume-cache: true
attach: true attach: true
artifact-key: 'darwin-x64' artifact-key: 'darwin-x64'
build-type: 'Darwin'
after-build-and-save: after-build-and-save:
- run: - run:
name: Configuring MAS build name: Configuring MAS build
@ -1900,6 +1924,7 @@ jobs:
rm -rf src/out/Default/Electron*.app rm -rf src/out/Default/Electron*.app
- build_and_save_artifacts: - build_and_save_artifacts:
artifact-key: 'mas-x64' artifact-key: 'mas-x64'
build-type: 'MAS'
after-persist: after-persist:
- persist_to_workspace: - persist_to_workspace:
root: . root: .
@ -1936,6 +1961,7 @@ jobs:
- electron-publish: - electron-publish:
attach: true attach: true
checkout: false checkout: false
build-type: 'Darwin'
osx-publish-arm64: osx-publish-arm64:
executor: executor:
@ -1958,6 +1984,7 @@ jobs:
- electron-publish: - electron-publish:
attach: true attach: true
checkout: false checkout: false
build-type: 'Darwin ARM64'
osx-testing-arm64: osx-testing-arm64:
executor: executor:
@ -1978,6 +2005,7 @@ jobs:
checkout-and-assume-cache: true checkout-and-assume-cache: true
attach: true attach: true
artifact-key: 'darwin-arm64' artifact-key: 'darwin-arm64'
build-type: 'Darwin ARM64'
after-build-and-save: after-build-and-save:
- run: - run:
name: Configuring MAS build name: Configuring MAS build
@ -1988,6 +2016,7 @@ jobs:
rm -rf src/out/Default/Electron*.app rm -rf src/out/Default/Electron*.app
- build_and_save_artifacts: - build_and_save_artifacts:
artifact-key: 'mas-arm64' artifact-key: 'mas-arm64'
build-type: 'MAS ARM64'
after-persist: after-persist:
- persist_to_workspace: - persist_to_workspace:
root: . root: .
@ -2014,6 +2043,7 @@ jobs:
- electron-publish: - electron-publish:
attach: true attach: true
checkout: false checkout: false
build-type: 'MAS'
mas-publish-arm64: mas-publish-arm64:
executor: executor:
@ -2036,6 +2066,7 @@ jobs:
- electron-publish: - electron-publish:
attach: true attach: true
checkout: false checkout: false
build-type: 'MAS ARM64'
# Layer 3: Tests. # Layer 3: Tests.
linux-x64-testing-tests: linux-x64-testing-tests: