Skip to content

Commit f43a16c

Browse files
committed
Merge branch 'release/2.9.0'
2 parents ae9a9c4 + b855a16 commit f43a16c

File tree

111 files changed

+2973
-1433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+2973
-1433
lines changed

.travis.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
language: php
33

44
os: [ linux ]
5+
dist: bionic
56

67
version: ~> 1.0
78

89
php: "7.2"
910

10-
node_js: "lts/*"
11-
1211
addons:
1312
chrome: stable
1413

@@ -48,10 +47,10 @@ jobs:
4847
- { name: "Custom job", env: ORCA_JOB=CUSTOM ORCA_CUSTOM_FIXTURE_INIT_ARGS="--help" ORCA_CUSTOM_TESTS_RUN_ARGS="--help" }
4948
- { name: "Integrated live test", env: ORCA_JOB=LIVE_TEST ORCA_ENABLE_NIGHTWATCH=FALSE }
5049
allow_failures:
51-
- { php: "7.3", env: ORCA_JOB=D9_READINESS }
5250
- env: ORCA_JOB=LIVE_TEST ORCA_ENABLE_NIGHTWATCH=FALSE
5351

5452
before_install:
53+
- nvm use 12.13.1
5554
- ../orca/bin/travis/self-test/before_install.sh
5655
- ../orca/bin/travis/before_install.sh
5756

bin/travis/script.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ cd "$(dirname "$0")" || exit; source _includes.sh
1919
[[ "$ORCA_FIXTURE_PROFILE" = "orca" ]] || SUT_ONLY="--sut-only"
2020

2121
case "$ORCA_JOB" in
22-
"STATIC_CODE_ANALYSIS") eval "orca qa:static-analysis $ORCA_SUT_DIR"; unset ORCA_ENABLE_NIGHTWATCH ;;
22+
"STATIC_CODE_ANALYSIS")
23+
eval "orca qa:static-analysis $ORCA_SUT_DIR"
24+
eval "orca report:code-coverage $ORCA_SUT_DIR"
25+
unset ORCA_ENABLE_NIGHTWATCH
26+
;;
2327
"DEPRECATED_CODE_SCAN") eval "orca qa:deprecated-code-scan --sut=$ORCA_SUT_NAME"; unset ORCA_ENABLE_NIGHTWATCH ;;
2428
"DEPRECATED_CODE_SCAN_CONTRIB") eval "orca qa:deprecated-code-scan --contrib"; unset ORCA_ENABLE_NIGHTWATCH ;;
2529
"ISOLATED_RECOMMENDED") eval "orca qa:automated-tests --sut=$ORCA_SUT_NAME --sut-only" ;;

composer.json

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
"@composer normalize"
8686
],
8787
"cghooks": "cghooks --ansi",
88+
"coverage": "phpunit --coverage-html var/coverage-report; open var/coverage-report/index.html",
8889
"phpcbf": "phpcbf",
8990
"phpcs": "phpcs -s --cache=var/cache/phpcs.json",
9091
"phplint": "parallel-lint --exclude vendor --ignore-fails .",

0 commit comments

Comments
 (0)