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

M1 chips & D9 support #8

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

M1 chips & D9 support #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40e13a2
Acquia moved behat out of acquia/blt core. Adding a dependency on acq…
Apr 30, 2021
f850f1a
Updating for ddev drupal9, and adding a custom docker image to suppor…
Apr 30, 2021
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
5 changes: 4 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
"role": "Maintainer"
}
],
"require": {},
"require": {
"acquia/blt": "^12",
"acquia/blt-behat": "^1.1"
},
"autoload": {
"psr-4": {
"Lcatlett\\BltDdev\\": "./src/"
Expand Down
2 changes: 1 addition & 1 deletion config/.ddev/docker-compose.chrome.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
chrome:
hostname: chrome
container_name: ddev-${DDEV_SITENAME}-chrome
image: yukinying/chrome-headless-browser:64.0.3282.24
image: mikejoconnor/headless-chromium
labels:
# These labels ensure this service is discoverable by ddev
com.ddev.site-name: ${DDEV_SITENAME}
Expand Down
4 changes: 2 additions & 2 deletions src/Blt/Plugin/Commands/BehatDdevCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Lcatlett\BltDdev\Blt\Plugin\Commands;

use Acquia\Blt\Robo\Commands\Tests\BehatCommand;
use Acquia\BltBehat\Blt\Plugin\Commands\BehatTestCommand;

class BehatDdevCommand extends BehatCommand {
class BehatDdevCommand extends BehatTestCommand {

/**
* Executes all behat tests.
Expand Down
4 changes: 2 additions & 2 deletions src/Blt/Plugin/Commands/DdevCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function ddevProjectInit() {
public function ddevInit() {
$this->say('Generating ddev project config');
$result = $this->taskExecStack()
->exec("ddev config --docroot docroot --project-type drupal8 --project-name \"{$this->getConfigValue('project.machine_name')}\"")
->exec("ddev config --docroot docroot --project-type drupal9 --project-name \"{$this->getConfigValue('project.machine_name')}\"")
->run();

if (!$result->wasSuccessful()) {
Expand Down Expand Up @@ -127,7 +127,7 @@ public function ddevConfig() {
}

// Re-init settings after old settings are removed..
$this->invokeCommand('tests:behat:init:config');
$this->invokeCommand('recipes:behat:init');
}
}
}
Expand Down