chore: use circleci v2.1 (#19346)
This allows us to have a workflow for release-builds that only runs when we trigger it via API. This will be used to implement a /ci command to allow folks to trigger release-style builds on their PRs.
This commit is contained in:
parent
6ff2d69842
commit
d45694dcb0
1 changed files with 48 additions and 6 deletions
|
@ -551,11 +551,11 @@ steps-lint: &steps-lint
|
||||||
chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
|
chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
|
||||||
gn_version="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep gn_version | head -n1 | cut -d\' -f4)"
|
gn_version="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep gn_version | head -n1 | cut -d\' -f4)"
|
||||||
|
|
||||||
cipd ensure -ensure-file - -root . <<-CIPD
|
echo \$ServiceURL https://chrome-infra-packages.appspot.com/ > c
|
||||||
\$ServiceURL https://chrome-infra-packages.appspot.com/
|
echo @Subdir src/buildtools/linux64 >> c
|
||||||
@Subdir src/buildtools/linux64
|
echo gn/gn/linux-amd64 $gn_version >> c
|
||||||
gn/gn/linux-amd64 $gn_version
|
cipd ensure -ensure-file - -root . < c
|
||||||
CIPD
|
rm -f c
|
||||||
|
|
||||||
echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/src/buildtools"' >> $BASH_ENV
|
echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/src/buildtools"' >> $BASH_ENV
|
||||||
- run:
|
- run:
|
||||||
|
@ -735,6 +735,13 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
|
||||||
- *step-ffmpeg-build
|
- *step-ffmpeg-build
|
||||||
- *step-ffmpeg-store
|
- *step-ffmpeg-store
|
||||||
|
|
||||||
|
# chromedriver
|
||||||
|
- *step-electron-chromedriver-build
|
||||||
|
- *step-electron-chromedriver-store
|
||||||
|
|
||||||
|
# typescript defs
|
||||||
|
- *step-maybe-generate-typescript-defs
|
||||||
|
|
||||||
# Save all data needed for a further tests run.
|
# Save all data needed for a further tests run.
|
||||||
- *step-persist-data-for-tests
|
- *step-persist-data-for-tests
|
||||||
|
|
||||||
|
@ -920,7 +927,14 @@ chromium-upgrade-branches: &chromium-upgrade-branches
|
||||||
/chromium\-upgrade\/[0-9]+/
|
/chromium\-upgrade\/[0-9]+/
|
||||||
|
|
||||||
# List of all jobs.
|
# List of all jobs.
|
||||||
version: 2
|
version: 2.1
|
||||||
|
parameters:
|
||||||
|
run_release_builds:
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
run_ci:
|
||||||
|
type: boolean
|
||||||
|
default: true
|
||||||
jobs:
|
jobs:
|
||||||
# Layer 0: Lint. Standalone.
|
# Layer 0: Lint. Standalone.
|
||||||
lint:
|
lint:
|
||||||
|
@ -1536,10 +1550,37 @@ jobs:
|
||||||
workflows:
|
workflows:
|
||||||
version: 2
|
version: 2
|
||||||
lint:
|
lint:
|
||||||
|
when: << pipeline.parameters.run_ci >>
|
||||||
jobs:
|
jobs:
|
||||||
- lint
|
- lint
|
||||||
|
|
||||||
|
# Runs builds in release mode, does not actually release anything
|
||||||
|
release-builds:
|
||||||
|
when: << pipeline.parameters.run_release_builds >>
|
||||||
|
jobs:
|
||||||
|
- linux-checkout
|
||||||
|
- mac-checkout
|
||||||
|
- linux-ia32-release:
|
||||||
|
requires:
|
||||||
|
- linux-checkout
|
||||||
|
- linux-x64-release:
|
||||||
|
requires:
|
||||||
|
- linux-checkout
|
||||||
|
- linux-arm-release:
|
||||||
|
requires:
|
||||||
|
- linux-checkout
|
||||||
|
- linux-arm64-release:
|
||||||
|
requires:
|
||||||
|
- linux-checkout
|
||||||
|
- osx-release:
|
||||||
|
requires:
|
||||||
|
- mac-checkout
|
||||||
|
- mas-release:
|
||||||
|
requires:
|
||||||
|
- mac-checkout
|
||||||
|
|
||||||
build-linux:
|
build-linux:
|
||||||
|
when: << pipeline.parameters.run_ci >>
|
||||||
jobs:
|
jobs:
|
||||||
- linux-checkout
|
- linux-checkout
|
||||||
|
|
||||||
|
@ -1599,6 +1640,7 @@ workflows:
|
||||||
- linux-checkout
|
- linux-checkout
|
||||||
|
|
||||||
build-mac:
|
build-mac:
|
||||||
|
when: << pipeline.parameters.run_ci >>
|
||||||
jobs:
|
jobs:
|
||||||
- mac-checkout
|
- mac-checkout
|
||||||
- osx-testing:
|
- osx-testing:
|
||||||
|
|
Loading…
Reference in a new issue