Skip to content

Commit

Permalink
Merge branch 'release/4.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
sayan goswami committed May 11, 2023
2 parents a17b65e + 1223a94 commit c38258b
Show file tree
Hide file tree
Showing 19 changed files with 164 additions and 480 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/orca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
- STATIC_CODE_ANALYSIS
- INTEGRATED_TEST_ON_OLDEST_SUPPORTED
- INTEGRATED_TEST_ON_PREVIOUS_MINOR
- INTEGRATED_TEST_ON_LATEST_LTS
# - INTEGRATED_UPGRADE_TEST_FROM_PREVIOUS_MINOR
- INTEGRATED_TEST_ON_CURRENT
# - INTEGRATED_UPGRADE_TEST_TO_NEXT_MINOR
Expand Down Expand Up @@ -66,11 +67,13 @@ jobs:
orca-enable-nightwatch: "TRUE"
orca-coverage-enable: "TRUE"

# Testing Drupal 10 in php 8.2 with nightwatch and coverage.
# Testing Drupal 10 in php 8.2.
- orca-job: ISOLATED_TEST_ON_CURRENT
php-version: "8.2"
orca-enable-nightwatch: "TRUE"
orca-coverage-enable: "TRUE"

# Testing latest Drupal 9 in php 8.2.
- orca-job: INTEGRATED_TEST_ON_LATEST_LTS
php-version: "8.2"


steps:
Expand Down
6 changes: 0 additions & 6 deletions .idea/orca.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion bin/ci/self-test/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ if [[ "$ORCA_JOB" == "STATIC_CODE_ANALYSIS" ]]; then
./vendor/bin/phpcs
./vendor/bin/parallel-lint --exclude vendor .
./vendor/bin/phpstan analyse src
./vendor/bin/phan -k phan.php --allow-polyfill-parser
./vendor/bin/phpmd . text phpmd.xml.dist --ignore-violations-on-exit

echo
Expand Down
8 changes: 3 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
"php-parallel-lint/php-parallel-lint": "^1.3.2",
"phploc/phploc": "^7.0.2",
"phpmd/phpmd": "^2.13",
"symfony/config": "^5.4.21",
"symfony/config": "^6.2.7",
"symfony/console": "^5.4.22",
"symfony/dependency-injection": "^6.0.20",
"symfony/expression-language": "^5.4.21",
"symfony/filesystem": "^5.4.21",
"symfony/finder": "^5.4.21",
"symfony/http-client": "^5.4.22",
"symfony/finder": "^6.2.7",
"symfony/http-client": "^6.2.10",
"symfony/options-resolver": "^5.4.21",
"symfony/phpunit-bridge": "^6.2.7",
"symfony/process": "^5.4.22",
Expand All @@ -57,7 +57,6 @@
},
"require-dev": {
"brainmaestro/composer-git-hooks": "^2.8.5",
"phan/phan": "^5.4.2",
"phpspec/prophecy-phpunit": "^2.0.2",
"phpstan/phpstan": "^1.10.14",
"phpunit/phpunit": "^9.6.7"
Expand Down Expand Up @@ -123,7 +122,6 @@
"cghooks": "cghooks --ansi",
"coverage": "phpunit --coverage-html var/coverage-report; open var/coverage-report/index.html",
"open-coverage": "open var/coverage-report/index.html",
"phan": "vendor/bin/phan -k phan.php --allow-polyfill-parser",
"phpcbf": "phpcbf",
"phpcs": "phpcs -s --cache=var/cache/phpcs.json",
"phplint": "parallel-lint --exclude vendor --ignore-fails .",
Expand Down
Loading

0 comments on commit c38258b

Please sign in to comment.