Skip to content

Commit afae951

Browse files
committed
Merge branch 'master' into issue_4032_queue-run-lease-time
* master: Remove latest unstable chiclet. Its not helpful. Remove mentions of Shippable. (drush-ops#4079) Add mysql service to Travis config. (drush-ops#4078) Fix link in docs. More docs about dynamic users in site.yml files. Fix drush-ops#4055. Sort inside namespaces in list command. (drush-ops#4057) Print class name in drush_op() Update dependencies. (drush-ops#4051) UNISH_NO_TIMEOUTS is unused since we moved to CLITrait. (drush-ops#4047) Add jsonapi command (drush-ops#4045) Fixes drush-ops#4034: Ensure that status code is nonzero on invalid shutdown (drush-ops#4037) Add webflo/drupal-core-require-dev (drush-ops#4041) Fix TTY detection for runserver command. (drush-ops#4033) Add vagrant transport to Drush. (drush-ops#4036)
2 parents 14b2b60 + d946453 commit afae951

33 files changed

+2456
-522
lines changed

.circleci/config.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ defaults: &defaults
44
environment:
55
TZ: "/usr/share/zoneinfo/America/Los_Angeles"
66
TERM: dumb
7-
UNISH_NO_TIMEOUTS: y
7+
SYMFONY_DEPRECATIONS_HELPER: disabled
88
PHPUNIT_ARGS: ""
99
PHP_SENDMAIL_PATH: /dev/null
1010

@@ -13,7 +13,7 @@ test_71_steps: &test71steps
1313
- checkout
1414
- run: cp .docker/zz-php.ini /usr/local/etc/php/conf.d/
1515
- run: composer install
16-
- run: $HOME/drush/.circleci/patch.sh
16+
- run: $HOME/drush/.circleci/patch.sh 8.7.x
1717
- run: composer lint
1818
- run: composer functional
1919

@@ -113,6 +113,7 @@ jobs:
113113
environment:
114114
- MYSQL_HOST=127.0.0.1
115115
- UNISH_DB_URL=mysql://root:@127.0.0.1
116+
- COMPOSER_MEMORY_LIMIT=-1
116117
- image: circleci/mysql:5.7.24
117118
steps:
118119
- checkout

.env.example

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
# MARIADB_TAG=
88
# PHP_TAG=7.2-dev-macos
99
#
10-
# UNISH_NO_TIMEOUTS=y
1110
# Uncomment to run tests against a different DB. Defaults to mysql.
1211
# UNISH_DB_URL=pgsql://unish:unish@postgres
1312
# UNISH_DB_URL=sqlite://sut/sites/dev/files/.ht.sqlite

.scenarios.lock/php5/composer.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"consolidation/output-formatters": "^3.3.1",
6565
"consolidation/robo": "^1.4.6",
6666
"consolidation/site-alias": "^3.0.0@stable",
67-
"consolidation/site-process": "^2.0.1",
67+
"consolidation/site-process": "^2.0.2",
6868
"grasmash/yaml-expander": "^1.1.1",
6969
"league/container": "~2",
7070
"psr/log": "~1.0",
@@ -79,13 +79,14 @@
7979
"webmozart/path-util": "^2.1.0"
8080
},
8181
"require-dev": {
82+
"webflo/drupal-core-strict": "8.6.x-dev",
83+
"webflo/drupal-core-require-dev": "8.6.x-dev",
8284
"lox/xhprof": "dev-master",
8385
"g1a/composer-test-scenarios": "^3",
8486
"phpunit/phpunit": "^4.8.36 || ^6.1",
85-
"squizlabs/php_codesniffer": "^2.7",
87+
"squizlabs/php_codesniffer": "^2.7 || ^3",
8688
"composer/installers": "^1.2",
8789
"cweagans/composer-patches": "~1.0",
88-
"webflo/drupal-core-strict": "8.6.x-dev",
8990
"drupal/empty_theme": "1.0",
9091
"drupal/devel": "^2",
9192
"drupal/alinks": "1.0.0",

0 commit comments

Comments
 (0)