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

Feature/drupal 10 #779

Open
wants to merge 30 commits into
base: 1.x
Choose a base branch
from
Open

Feature/drupal 10 #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0250386
update
jonpugh Nov 27, 2023
22b810c
Fix robo commands to use latest symfony process.
jonpugh Nov 27, 2023
0782929
Composer package updates:
jonpugh Nov 28, 2023
aa31d21
Composer package updates:
jonpugh Nov 28, 2023
03ef2f1
Composer package updates:
jonpugh Nov 28, 2023
f06c0db
Add drush patch for drupal 10 compat.
jonpugh Nov 28, 2023
059945b
Add 10.x to tests.
jonpugh Nov 28, 2023
a1b11c6
Merge branch '1.x' of github.com:opendevshop/devshop into feature/dru…
jonpugh Nov 28, 2023
278deb3
Add patch to symfony/console 4.
jonpugh Nov 28, 2023
8a6e01d
adding patch URL
jonpugh Nov 28, 2023
f3ae2f9
Composer package updates:
jonpugh Nov 28, 2023
f5f59c8
update php platform to 8.1
jonpugh Nov 28, 2023
15e2d3c
update provision for git reset stuff.
jonpugh Nov 28, 2023
912cd27
update provision for git reset stuff.
jonpugh Nov 28, 2023
25d1bb4
update provision for git reset stuff.
jonpugh Nov 28, 2023
6b288fe
update provision for git reset stuff.
jonpugh Nov 28, 2023
d001435
add patches to root
jonpugh Dec 11, 2023
030a608
add cweagans/patches
jonpugh Dec 11, 2023
6c2e38a
removing patch for drush 8
jonpugh Dec 11, 2023
0f97a75
hash update
jonpugh Dec 11, 2023
f59d1b4
New Patch
jonpugh Dec 11, 2023
48e38c6
update patch
jonpugh Dec 11, 2023
7ae76c8
update patch
jonpugh Dec 11, 2023
eb8b111
update patch
jonpugh Dec 11, 2023
231ebd8
typo
jonpugh Dec 11, 2023
9a91cc9
update patch
jonpugh Dec 11, 2023
03c2ad6
We have to use 8.0 for now because the containers have that.
jonpugh Dec 14, 2023
15cd7eb
typo
jonpugh Dec 14, 2023
b8cf59a
Merge branch 'feature/drupal-10' of github.com:opendevshop/devshop in…
jonpugh Dec 19, 2023
18d8ae4
Composer package updates:
jonpugh Dec 21, 2023
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
12 changes: 7 additions & 5 deletions RoboFile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
require_once 'vendor/autoload.php';

use DevShop\Component\Common\GitRepository;
use Symfony\Component\Process\Process;
use Symfony\Component\Yaml\Yaml;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Exception\RuntimeException;
Expand Down Expand Up @@ -311,7 +312,7 @@ public function build($folder = 'docker', $service = 'all', $opts = [
$docker_compose_build_opts = "";

$provision_io = new \DevShop\Component\PowerProcess\PowerProcessStyle($this->input(), $this->output());
$process = new \DevShop\Component\PowerProcess\PowerProcess("docker-compose build $docker_compose_build_opts $service", $provision_io);
$process = new Process(["docker-compose", "build", $docker_compose_build_opts, $service], $provision_io);
$process->setEnv($env_build);
$process->disableOutput();
$process->setTimeout(null);
Expand Down Expand Up @@ -792,17 +793,18 @@ public function restart() {
/**
* Enter a bash shell in the devmaster container.
*/
public function shell($user = 'aegir', $service = 'devshop.server') {

public function shell($user = 'aegir', $service = 'docker-devshop.server-1') {
if ($user) {
$process = new \Symfony\Component\Process\Process("docker-compose exec --user $user $service bash");
$process = new Process(["docker", "exec", "-ti", "--user", $user, $service, "bash"]);
}
else {
$process = new \Symfony\Component\Process\Process("docker-compose exec $service bash");
$process = new Process(["docker-compose", "exec", "-ti", $service, "bash"]);
}
$process->setTty(TRUE);
$process->setTimeout(NULL);
$process->setEnv(['COMPOSE_FILE' => './docker/docker-compose.yml']);

$this->say("Running: " . $process->getCommandLine());
$process->run();
return $process->getExitCode();
}
Expand Down
11 changes: 9 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"php-http/httplug": "^2.3",
"devshop/git-traits": "1.x-dev",
"drush/drush": "^10.6",
"devshop/github-api-cli": "1.x-dev"
"devshop/github-api-cli": "1.x-dev",
"cweagans/composer-patches": "^1.7"
},
"replace": {
"drupal/drupal": "*"
Expand Down Expand Up @@ -81,7 +82,8 @@
"sort-packages:": "true",
"allow-plugins": {
"devshop/git-split": true,
"devshop/yaml-tasks": true
"devshop/yaml-tasks": true,
"cweagans/composer-patches": true
},
"platform": {
"php": "7.4.0"
Expand All @@ -105,6 +107,11 @@
"src/DevShop/Component/YamlTasks": "https://github.com/devshop-packages/yaml-tasks.git",
"src/DevShop/Component/ControlProject": "https://github.com/devshop-packages/devshop-control-project.git"
}
},
"patches": {
"symfony/console": {
"https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-12-11/3353492-symfony-console-4-update_1.patch"
}
}
},
"minimum-stability": "dev",
Expand Down
Loading
Loading