Skip to content

Commit

Permalink
Merge branch 'master' into issue_4032_queue-run-lease-time
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
m4olivei committed May 24, 2019
2 parents 14b2b60 + d946453 commit afae951
Show file tree
Hide file tree
Showing 33 changed files with 2,456 additions and 522 deletions.
5 changes: 3 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defaults: &defaults
environment:
TZ: "/usr/share/zoneinfo/America/Los_Angeles"
TERM: dumb
UNISH_NO_TIMEOUTS: y
SYMFONY_DEPRECATIONS_HELPER: disabled
PHPUNIT_ARGS: ""
PHP_SENDMAIL_PATH: /dev/null

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

Expand Down Expand Up @@ -113,6 +113,7 @@ jobs:
environment:
- MYSQL_HOST=127.0.0.1
- UNISH_DB_URL=mysql://root:@127.0.0.1
- COMPOSER_MEMORY_LIMIT=-1
- image: circleci/mysql:5.7.24
steps:
- checkout
Expand Down
1 change: 0 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# MARIADB_TAG=
# PHP_TAG=7.2-dev-macos
#
# UNISH_NO_TIMEOUTS=y
# Uncomment to run tests against a different DB. Defaults to mysql.
# UNISH_DB_URL=pgsql://unish:unish@postgres
# UNISH_DB_URL=sqlite://sut/sites/dev/files/.ht.sqlite
Expand Down
7 changes: 4 additions & 3 deletions .scenarios.lock/php5/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"consolidation/output-formatters": "^3.3.1",
"consolidation/robo": "^1.4.6",
"consolidation/site-alias": "^3.0.0@stable",
"consolidation/site-process": "^2.0.1",
"consolidation/site-process": "^2.0.2",
"grasmash/yaml-expander": "^1.1.1",
"league/container": "~2",
"psr/log": "~1.0",
Expand All @@ -79,13 +79,14 @@
"webmozart/path-util": "^2.1.0"
},
"require-dev": {
"webflo/drupal-core-strict": "8.6.x-dev",
"webflo/drupal-core-require-dev": "8.6.x-dev",
"lox/xhprof": "dev-master",
"g1a/composer-test-scenarios": "^3",
"phpunit/phpunit": "^4.8.36 || ^6.1",
"squizlabs/php_codesniffer": "^2.7",
"squizlabs/php_codesniffer": "^2.7 || ^3",
"composer/installers": "^1.2",
"cweagans/composer-patches": "~1.0",
"webflo/drupal-core-strict": "8.6.x-dev",
"drupal/empty_theme": "1.0",
"drupal/devel": "^2",
"drupal/alinks": "1.0.0",
Expand Down

0 comments on commit afae951

Please sign in to comment.