Skip to content

Commit

Permalink
Merge branch 'release/3.15.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
sayan goswami committed Mar 7, 2022
2 parents 18fa1f8 + 7fbe823 commit 535c432
Show file tree
Hide file tree
Showing 15 changed files with 466 additions and 615 deletions.
5 changes: 5 additions & 0 deletions .idea/orca.iml

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

4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
# - { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, name: "Integrated test on next major, latest minor dev Drupal core version" }
- { env: ORCA_JOB=ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_BETA_OR_LATER, name: "Isolated upgrade test to next major beta-or-later Drupal core version" }
- { env: ORCA_JOB=ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_DEV, name: "Isolated upgrade test to next major dev Drupal core version" }
- { env: ORCA_LIVE_TEST=TRUE, name: "Integrated live test" }
- { env: ORCA_LIVE_TEST=TRUE ORCA_PACKAGES_CONFIG= ORCA_PACKAGES_CONFIG_ALTER=, name: "Integrated live test" }
allow_failures:
- env: ORCA_JOB=DEPRECATED_CODE_SCAN_W_CONTRIB
- env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MINOR_DEV
Expand All @@ -73,7 +73,7 @@ jobs:
- env: ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV ORCA_ENABLE_NIGHTWATCH=TRUE

before_install:
- nvm install 12.13.1; nvm use 12.13.1
- nvm install 12.20.0; nvm use 12.20.0
- ../orca/bin/travis/self-test/before_install.sh
- ../orca/bin/travis/before_install.sh

Expand Down
31 changes: 0 additions & 31 deletions bin/changelog.sh

This file was deleted.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"symfony/config": "^4.1",
"symfony/console": "^4.1",
"symfony/dependency-injection": "^4.1",
"symfony/expression-language": "^5.4",
"symfony/filesystem": "^4.1",
"symfony/finder": "^4.1",
"symfony/http-client": "^5.1",
Expand Down Expand Up @@ -119,7 +120,6 @@
"@phpunit"
],
"cghooks": "cghooks --ansi",
"changelog": "./bin/changelog.sh",
"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",
Expand Down
Loading

0 comments on commit 535c432

Please sign in to comment.