Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DT-747: Removing dependency on webflo. #3908

Merged
merged 4 commits into from
Nov 4, 2019
Merged

DT-747: Removing dependency on webflo. #3908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce11cf8
DT-747: Removing dependency on webflo.
danepowell Nov 1, 2019
3e5a0bb
Use 11.x-dev.
danepowell Nov 1, 2019
3139e51
Use webflo for tests.
danepowell Nov 4, 2019
0e8c4a6
Fixed tests.
danepowell Nov 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Robo/Commands/Tests/DrupalTestCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ public function run() {
* Throws an exception if any Drupal test fails.
*/
public function executeTests() {
$this->logger->notice("Ensure that you have installed Drupal Core's dev dependencies (such as via https://github.com/webflo/drupal-core-require-dev) prior to running this command.");
if (empty(shell_exec('which java'))) {
$this->logger->warning("Cannot find Java. Drupal tests require Selenium, which requires Java. Drupal tests will be skipped.");
return;
Expand Down
18 changes: 18 additions & 0 deletions src/Update/Updates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,4 +848,22 @@ public function update_10004000() {
}
}

/**
* Version 11.0.0.
*
* @Update(
* version = "11000000",
* description = "Updates for BLT 11."
* )
*/
public function update_11000000() {
$composer_json = $this->updater->getComposerJson();
$template_composer_json = $this->updater->getTemplateComposerJson();
// Update blt-require-dev to 11.x.
if (array_key_exists('acquia/blt-require-dev', $composer_json['require-dev'])) {
$composer_json['require-dev']['acquia/blt-require-dev'] = $template_composer_json['require-dev']['acquia/blt-require-dev'];
$this->updater->writeComposerJson($composer_json);
}
}

}
2 changes: 1 addition & 1 deletion subtree-splits/blt-project/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"drupal/shield": "^1.2.0"
},
"require-dev": {
"acquia/blt-require-dev": "^10.0.0-alpha1"
"acquia/blt-require-dev": "11.x-dev"
},
"config": {
"platform": {
Expand Down
5 changes: 2 additions & 3 deletions subtree-splits/blt-require-dev/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@
"drupal/drupal-extension": "~3.2",
"jarnaiz/behat-junit-formatter": "^1.3.2",
"phpunit/phpunit": "^4.8 || ^6.5",
"squizlabs/php_codesniffer": "^3.0.1",
"webflo/drupal-core-require-dev": "^8.6.1"
"squizlabs/php_codesniffer": "^3.0.1"
},
"extra": {
"branch-alias": {
"dev-master": "10.x-dev"
"dev-master": "11.x-dev"
}
},
"minimum-stability": "dev"
Expand Down
3 changes: 3 additions & 0 deletions tests/phpunit/src/TestDrupalTestCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ public function setUp() {
$this->sqlite = $this->config->get("tests.drupal.sqlite");
$this->url = $this->config->get("tests.drupal.simpletest-base-url");
$this->execute('composer require se/selenium-server-standalone');
// drupal-core-require-dev has some nasty dependency conflicts.
$this->execute('composer require webflo/drupal-core-require-dev --no-update');
$this->execute('composer update');
}

/**
Expand Down