ci: clean up the CircleCI config
This commit is contained in:
Aleksei Kuzmin
parent
32a9df2940
commit
499fc48ccf
1 changed files with 48 additions and 79 deletions
|
|
@ -189,11 +189,6 @@ step-ffmpeg-build: &step-ffmpeg-build
|
||||||
cd src
|
cd src
|
||||||
ninja -C out/ffmpeg third_party/ffmpeg
|
ninja -C out/ffmpeg third_party/ffmpeg
|
||||||
|
|
||||||
step-ffmpeg-store: &step-ffmpeg-store
|
|
||||||
store_artifacts:
|
|
||||||
path: src/out/ffmpeg/libffmpeg.so
|
|
||||||
destination: libffmpeg.so
|
|
||||||
|
|
||||||
step-verify-ffmpeg: &step-verify-ffmpeg
|
step-verify-ffmpeg: &step-verify-ffmpeg
|
||||||
run:
|
run:
|
||||||
name: Verify ffmpeg
|
name: Verify ffmpeg
|
||||||
|
|
@ -201,29 +196,13 @@ step-verify-ffmpeg: &step-verify-ffmpeg
|
||||||
cd src
|
cd src
|
||||||
python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
|
python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
|
||||||
|
|
||||||
step-setup-for-headless-testing: &step-setup-for-headless-testing
|
step-setup-linux-for-headless-testing: &step-setup-linux-for-headless-testing
|
||||||
run:
|
run:
|
||||||
name: Setup for headless testing
|
name: Setup for headless testing
|
||||||
command: |
|
command: |
|
||||||
sh -e /etc/init.d/xvfb start
|
if [ "`uname`" != "Darwin" ]; then
|
||||||
|
sh -e /etc/init.d/xvfb start
|
||||||
step-electron-tests-run: &step-electron-tests-run
|
fi
|
||||||
run:
|
|
||||||
name: Run Electron tests
|
|
||||||
environment:
|
|
||||||
DISPLAY: ':99.0'
|
|
||||||
MOCHA_REPORTER: mocha-multi-reporters
|
|
||||||
MOCHA_FILE: junit/test-results.xml
|
|
||||||
MOCHA_MULTI_REPORTERS: mocha-junit-reporter, tap
|
|
||||||
ELECTRON_DISABLE_SECURITY_WARNINGS: 1
|
|
||||||
command: |
|
|
||||||
cd src
|
|
||||||
export ELECTRON_OUT_DIR=Default
|
|
||||||
(cd electron && npm run test -- --ci --enable-logging)
|
|
||||||
|
|
||||||
step-electron-tests-store-results: &step-electron-tests-store-results
|
|
||||||
store_test_results:
|
|
||||||
path: src/junit
|
|
||||||
|
|
||||||
step-show-sccache-stats: &step-show-sccache-stats
|
step-show-sccache-stats: &step-show-sccache-stats
|
||||||
run:
|
run:
|
||||||
|
|
@ -267,7 +246,7 @@ steps-checkout: &steps-checkout
|
||||||
- depot_tools
|
- depot_tools
|
||||||
- src
|
- src
|
||||||
|
|
||||||
steps-debug-build: &steps-debug-build
|
steps-electron-build: &steps-electron-build
|
||||||
steps:
|
steps:
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
at: .
|
at: .
|
||||||
|
|
@ -280,28 +259,7 @@ steps-debug-build: &steps-debug-build
|
||||||
|
|
||||||
- *step-show-sccache-stats
|
- *step-show-sccache-stats
|
||||||
|
|
||||||
steps-testing-build: &steps-testing-build
|
steps-electron-build-for-tests: &steps-electron-build-for-tests
|
||||||
steps:
|
|
||||||
- attach_workspace:
|
|
||||||
at: .
|
|
||||||
- *step-depot-tools-add-to-path
|
|
||||||
- *step-setup-env-for-build
|
|
||||||
|
|
||||||
# Electron app
|
|
||||||
- *step-electron-gn-gen
|
|
||||||
- *step-electron-build
|
|
||||||
- *step-electron-dist-build
|
|
||||||
- *step-electron-dist-store
|
|
||||||
|
|
||||||
# Node.js headers
|
|
||||||
- *step-nodejs-headers-build
|
|
||||||
|
|
||||||
- *step-show-sccache-stats
|
|
||||||
|
|
||||||
# Save all data needed for a further tests run.
|
|
||||||
- *step-persist-data-for-tests
|
|
||||||
|
|
||||||
steps-release-build: &steps-release-build
|
|
||||||
steps:
|
steps:
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
at: .
|
at: .
|
||||||
|
|
@ -355,8 +313,10 @@ steps-ffmpeg-build: &steps-ffmpeg-build
|
||||||
|
|
||||||
- *step-ffmpeg-gn-gen
|
- *step-ffmpeg-gn-gen
|
||||||
- *step-ffmpeg-build
|
- *step-ffmpeg-build
|
||||||
- *step-ffmpeg-store
|
|
||||||
|
|
||||||
|
- store_artifacts:
|
||||||
|
path: src/out/ffmpeg/libffmpeg.so
|
||||||
|
destination: libffmpeg.so
|
||||||
- persist_to_workspace:
|
- persist_to_workspace:
|
||||||
root: .
|
root: .
|
||||||
paths:
|
paths:
|
||||||
|
|
@ -380,7 +340,7 @@ steps-verify-ffmpeg: &steps-verify-ffmpeg
|
||||||
at: .
|
at: .
|
||||||
- *step-depot-tools-add-to-path
|
- *step-depot-tools-add-to-path
|
||||||
- *step-electron-dist-unzip
|
- *step-electron-dist-unzip
|
||||||
- *step-setup-for-headless-testing
|
- *step-setup-linux-for-headless-testing
|
||||||
|
|
||||||
- *step-verify-ffmpeg
|
- *step-verify-ffmpeg
|
||||||
|
|
||||||
|
|
@ -390,10 +350,24 @@ steps-tests: &steps-tests
|
||||||
at: .
|
at: .
|
||||||
- *step-depot-tools-add-to-path
|
- *step-depot-tools-add-to-path
|
||||||
- *step-electron-dist-unzip
|
- *step-electron-dist-unzip
|
||||||
- *step-setup-for-headless-testing
|
- *step-setup-linux-for-headless-testing
|
||||||
|
- *step-install-nodejs-on-mac
|
||||||
|
|
||||||
- *step-electron-tests-run
|
- run:
|
||||||
- *step-electron-tests-store-results
|
name: Run Electron tests
|
||||||
|
environment:
|
||||||
|
DISPLAY: ':99.0'
|
||||||
|
MOCHA_REPORTER: mocha-multi-reporters
|
||||||
|
MOCHA_FILE: junit/test-results.xml
|
||||||
|
MOCHA_MULTI_REPORTERS: mocha-junit-reporter, tap
|
||||||
|
ELECTRON_DISABLE_SECURITY_WARNINGS: 1
|
||||||
|
command: |
|
||||||
|
cd src
|
||||||
|
export ELECTRON_OUT_DIR=Default
|
||||||
|
(cd electron && npm run test -- --ci --enable-logging)
|
||||||
|
|
||||||
|
- store_test_results:
|
||||||
|
path: src/junit
|
||||||
|
|
||||||
# Mac build are different in a few ways:
|
# Mac build are different in a few ways:
|
||||||
# 1. We can't use save_cache/restore_cache on Mac,
|
# 1. We can't use save_cache/restore_cache on Mac,
|
||||||
|
|
@ -418,7 +392,9 @@ steps-build-mac: &steps-build-mac
|
||||||
# ffmpeg
|
# ffmpeg
|
||||||
- *step-ffmpeg-gn-gen
|
- *step-ffmpeg-gn-gen
|
||||||
- *step-ffmpeg-build
|
- *step-ffmpeg-build
|
||||||
- *step-ffmpeg-store
|
- store_artifacts:
|
||||||
|
path: src/out/ffmpeg/libffmpeg.dylib
|
||||||
|
destination: libffmpeg.dylib
|
||||||
|
|
||||||
# It would be better to verify ffmpeg as a part of a test job,
|
# It would be better to verify ffmpeg as a part of a test job,
|
||||||
# but it requires `gn` to run, and it's complicated
|
# but it requires `gn` to run, and it's complicated
|
||||||
|
|
@ -439,17 +415,6 @@ steps-build-mac: &steps-build-mac
|
||||||
# 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
|
||||||
|
|
||||||
steps-tests-mac: &steps-tests-mac
|
|
||||||
steps:
|
|
||||||
- attach_workspace:
|
|
||||||
at: .
|
|
||||||
- *step-depot-tools-add-to-path
|
|
||||||
- *step-electron-dist-unzip
|
|
||||||
- *step-install-nodejs-on-mac
|
|
||||||
|
|
||||||
- *step-electron-tests-run
|
|
||||||
- *step-electron-tests-store-results
|
|
||||||
|
|
||||||
filter-only-prs-from-forks: &filter-only-prs-from-forks
|
filter-only-prs-from-forks: &filter-only-prs-from-forks
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
|
|
@ -480,13 +445,13 @@ jobs:
|
||||||
<<: *machine-linux-2xlarge
|
<<: *machine-linux-2xlarge
|
||||||
environment:
|
environment:
|
||||||
<<: *env-debug-build
|
<<: *env-debug-build
|
||||||
<<: *steps-debug-build
|
<<: *steps-electron-build
|
||||||
|
|
||||||
linux-x64-testing:
|
linux-x64-testing:
|
||||||
<<: *machine-linux-2xlarge
|
<<: *machine-linux-2xlarge
|
||||||
environment:
|
environment:
|
||||||
<<: *env-testing-build
|
<<: *env-testing-build
|
||||||
<<: *steps-testing-build
|
<<: *steps-electron-build-for-tests
|
||||||
|
|
||||||
linux-x64-ffmpeg:
|
linux-x64-ffmpeg:
|
||||||
<<: *machine-linux-medium
|
<<: *machine-linux-medium
|
||||||
|
|
@ -497,21 +462,21 @@ jobs:
|
||||||
<<: *machine-linux-2xlarge
|
<<: *machine-linux-2xlarge
|
||||||
environment:
|
environment:
|
||||||
<<: *env-release-build
|
<<: *env-release-build
|
||||||
<<: *steps-release-build
|
<<: *steps-electron-build-for-tests
|
||||||
|
|
||||||
linux-ia32-debug:
|
linux-ia32-debug:
|
||||||
<<: *machine-linux-2xlarge
|
<<: *machine-linux-2xlarge
|
||||||
environment:
|
environment:
|
||||||
<<: *env-ia32
|
<<: *env-ia32
|
||||||
<<: *env-debug-build
|
<<: *env-debug-build
|
||||||
<<: *steps-debug-build
|
<<: *steps-electron-build
|
||||||
|
|
||||||
linux-ia32-testing:
|
linux-ia32-testing:
|
||||||
<<: *machine-linux-2xlarge
|
<<: *machine-linux-2xlarge
|
||||||
environment:
|
environment:
|
||||||
<<: *env-ia32
|
<<: *env-ia32
|
||||||
<<: *env-testing-build
|
<<: *env-testing-build
|
||||||
<<: *steps-testing-build
|
<<: *steps-electron-build-for-tests
|
||||||
|
|
||||||
linux-ia32-ffmpeg:
|
linux-ia32-ffmpeg:
|
||||||
<<: *machine-linux-medium
|
<<: *machine-linux-medium
|
||||||
|
|
@ -524,21 +489,21 @@ jobs:
|
||||||
environment:
|
environment:
|
||||||
<<: *env-ia32
|
<<: *env-ia32
|
||||||
<<: *env-release-build
|
<<: *env-release-build
|
||||||
<<: *steps-release-build
|
<<: *steps-electron-build-for-tests
|
||||||
|
|
||||||
linux-arm-debug:
|
linux-arm-debug:
|
||||||
<<: *machine-linux-2xlarge
|
<<: *machine-linux-2xlarge
|
||||||
environment:
|
environment:
|
||||||
<<: *env-arm
|
<<: *env-arm
|
||||||
<<: *env-debug-build
|
<<: *env-debug-build
|
||||||
<<: *steps-debug-build
|
<<: *steps-electron-build
|
||||||
|
|
||||||
linux-arm-testing:
|
linux-arm-testing:
|
||||||
<<: *machine-linux-2xlarge
|
<<: *machine-linux-2xlarge
|
||||||
environment:
|
environment:
|
||||||
<<: *env-arm
|
<<: *env-arm
|
||||||
<<: *env-testing-build
|
<<: *env-testing-build
|
||||||
<<: *steps-testing-build
|
<<: *steps-electron-build-for-tests
|
||||||
|
|
||||||
linux-arm-ffmpeg:
|
linux-arm-ffmpeg:
|
||||||
<<: *machine-linux-medium
|
<<: *machine-linux-medium
|
||||||
|
|
@ -551,7 +516,7 @@ jobs:
|
||||||
environment:
|
environment:
|
||||||
<<: *env-arm
|
<<: *env-arm
|
||||||
<<: *env-release-build
|
<<: *env-release-build
|
||||||
<<: *steps-release-build
|
<<: *steps-electron-build-for-tests
|
||||||
|
|
||||||
linux-arm-mksnapshot:
|
linux-arm-mksnapshot:
|
||||||
<<: *machine-linux-medium
|
<<: *machine-linux-medium
|
||||||
|
|
@ -564,14 +529,14 @@ jobs:
|
||||||
environment:
|
environment:
|
||||||
<<: *env-arm64
|
<<: *env-arm64
|
||||||
<<: *env-debug-build
|
<<: *env-debug-build
|
||||||
<<: *steps-debug-build
|
<<: *steps-electron-build
|
||||||
|
|
||||||
linux-arm64-testing:
|
linux-arm64-testing:
|
||||||
<<: *machine-linux-2xlarge
|
<<: *machine-linux-2xlarge
|
||||||
environment:
|
environment:
|
||||||
<<: *env-arm64
|
<<: *env-arm64
|
||||||
<<: *env-testing-build
|
<<: *env-testing-build
|
||||||
<<: *steps-testing-build
|
<<: *steps-electron-build-for-tests
|
||||||
|
|
||||||
linux-arm64-ffmpeg:
|
linux-arm64-ffmpeg:
|
||||||
<<: *machine-linux-medium
|
<<: *machine-linux-medium
|
||||||
|
|
@ -584,7 +549,7 @@ jobs:
|
||||||
environment:
|
environment:
|
||||||
<<: *env-arm64
|
<<: *env-arm64
|
||||||
<<: *env-release-build
|
<<: *env-release-build
|
||||||
<<: *steps-release-build
|
<<: *steps-electron-build-for-tests
|
||||||
|
|
||||||
linux-arm64-mksnapshot:
|
linux-arm64-mksnapshot:
|
||||||
<<: *machine-linux-medium
|
<<: *machine-linux-medium
|
||||||
|
|
@ -644,11 +609,11 @@ jobs:
|
||||||
|
|
||||||
osx-testing-tests:
|
osx-testing-tests:
|
||||||
<<: *machine-mac
|
<<: *machine-mac
|
||||||
<<: *steps-tests-mac
|
<<: *steps-tests
|
||||||
|
|
||||||
mas-testing-tests:
|
mas-testing-tests:
|
||||||
<<: *machine-mac
|
<<: *machine-mac
|
||||||
<<: *steps-tests-mac
|
<<: *steps-tests
|
||||||
|
|
||||||
workflows:
|
workflows:
|
||||||
version: 2
|
version: 2
|
||||||
|
|
@ -705,6 +670,7 @@ workflows:
|
||||||
- linux-arm-ffmpeg:
|
- linux-arm-ffmpeg:
|
||||||
requires:
|
requires:
|
||||||
- linux-arm-checkout
|
- linux-arm-checkout
|
||||||
|
|
||||||
- linux-arm64-debug:
|
- linux-arm64-debug:
|
||||||
requires:
|
requires:
|
||||||
- linux-arm64-checkout
|
- linux-arm64-checkout
|
||||||
|
|
@ -750,18 +716,21 @@ workflows:
|
||||||
- linux-x64-release-tests:
|
- linux-x64-release-tests:
|
||||||
requires:
|
requires:
|
||||||
- linux-x64-release
|
- linux-x64-release
|
||||||
|
|
||||||
- linux-ia32-release:
|
- linux-ia32-release:
|
||||||
requires:
|
requires:
|
||||||
- linux-checkout
|
- linux-checkout
|
||||||
- linux-ia32-release-tests:
|
- linux-ia32-release-tests:
|
||||||
requires:
|
requires:
|
||||||
- linux-ia32-release
|
- linux-ia32-release
|
||||||
|
|
||||||
- linux-arm-release:
|
- linux-arm-release:
|
||||||
requires:
|
requires:
|
||||||
- linux-arm-checkout
|
- linux-arm-checkout
|
||||||
- linux-arm-mksnapshot:
|
- linux-arm-mksnapshot:
|
||||||
requires:
|
requires:
|
||||||
- linux-arm-checkout
|
- linux-arm-checkout
|
||||||
|
|
||||||
- linux-arm64-release:
|
- linux-arm64-release:
|
||||||
requires:
|
requires:
|
||||||
- linux-arm64-checkout
|
- linux-arm64-checkout
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue