From 1d1e804f99ad22d67398f0e26f58da6e21c26249 Mon Sep 17 00:00:00 2001 From: David Burns Date: Tue, 9 Jul 2024 10:53:30 -0400 Subject: [PATCH 1/7] Empty commit From da43e2a13581188c46ec0b5122135091cbf93f74 Mon Sep 17 00:00:00 2001 From: David Burns Date: Tue, 9 Jul 2024 11:10:45 -0400 Subject: [PATCH 2/7] 000: composer and phpunit upgrade. --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 52218504..0fcb549a 100644 --- a/composer.json +++ b/composer.json @@ -28,14 +28,15 @@ "\\Lullabot\\Drainpipe\\BinaryInstallerPlugin" ], "drupal-scaffold": { - "gitignore": true, + "gitignore": "true", "file-mapping": { "[project-root]/.env": { "mode": "replace", "path": "scaffold/env/env", "overwrite": false } - } + }, + "allowed-packages": ["lullabot/drainpipe", "lullabot/drainpipe-dev"] } }, "config": { From efd1aca7ab40550154208819ac2e09bcd7fb18ba Mon Sep 17 00:00:00 2001 From: Luis Aveiga Date: Thu, 11 Jul 2024 09:19:56 -0500 Subject: [PATCH 3/7] Temporarily removing steps that modify the DB --- .tugboat/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.tugboat/config.yml b/.tugboat/config.yml index 6073e6b7..cf533cad 100644 --- a/.tugboat/config.yml +++ b/.tugboat/config.yml @@ -20,9 +20,9 @@ services: commands: init: ./.tugboat/steps/1-init.sh - update: ./.tugboat/steps/2-update.sh - build: ./.tugboat/steps/3-build.sh - online: ./.tugboat/steps/4-online.sh + update: sleep 1 + build: sleep 1 + online: sleep 1 aliases: - foo From c5071068d38c015758d77a79337c1a8f049f5276 Mon Sep 17 00:00:00 2001 From: Luis Aveiga Date: Thu, 11 Jul 2024 09:29:28 -0500 Subject: [PATCH 4/7] allow update step [skip ci] --- .tugboat/config.yml | 2 +- scaffold/Taskfile.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.tugboat/config.yml b/.tugboat/config.yml index cf533cad..0c8b06e0 100644 --- a/.tugboat/config.yml +++ b/.tugboat/config.yml @@ -20,7 +20,7 @@ services: commands: init: ./.tugboat/steps/1-init.sh - update: sleep 1 + update: ./.tugboat/steps/2-update.sh build: sleep 1 online: sleep 1 diff --git a/scaffold/Taskfile.yml b/scaffold/Taskfile.yml index 3df28cb6..e83583ca 100644 --- a/scaffold/Taskfile.yml +++ b/scaffold/Taskfile.yml @@ -27,7 +27,7 @@ tasks: # Replace this with a command to fetch your database. - ./vendor/bin/drush site:install -y - echo "🧹 Sanitising database" - - ./vendor/bin/drush sql:sanitize --yes + # - ./vendor/bin/drush sql:sanitize --yes build: desc: "Builds the project for production" From 8766997b4cb01932f74244b9cd84e5f1b791c02e Mon Sep 17 00:00:00 2001 From: Luis Aveiga Date: Thu, 11 Jul 2024 09:58:29 -0500 Subject: [PATCH 5/7] Force the creation of the sessions table by logging with wget --- .tugboat/config.yml | 4 ++-- scaffold/Taskfile.yml | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.tugboat/config.yml b/.tugboat/config.yml index 0c8b06e0..6073e6b7 100644 --- a/.tugboat/config.yml +++ b/.tugboat/config.yml @@ -21,8 +21,8 @@ services: commands: init: ./.tugboat/steps/1-init.sh update: ./.tugboat/steps/2-update.sh - build: sleep 1 - online: sleep 1 + build: ./.tugboat/steps/3-build.sh + online: ./.tugboat/steps/4-online.sh aliases: - foo diff --git a/scaffold/Taskfile.yml b/scaffold/Taskfile.yml index e83583ca..8679e461 100644 --- a/scaffold/Taskfile.yml +++ b/scaffold/Taskfile.yml @@ -26,8 +26,11 @@ tasks: cmds: # Replace this with a command to fetch your database. - ./vendor/bin/drush site:install -y + # Forcing the sessions table to exist + # otherwise, truncating it will fail. + - ./vendor/bin/drush uli | xargs wget --spider - echo "🧹 Sanitising database" - # - ./vendor/bin/drush sql:sanitize --yes + - ./vendor/bin/drush sql:sanitize --yes build: desc: "Builds the project for production" From f4ef23596fc7d308ad34186163ed8e0520fd0659 Mon Sep 17 00:00:00 2001 From: Luis Aveiga Date: Thu, 11 Jul 2024 11:34:46 -0500 Subject: [PATCH 6/7] Update composer requirements, Drush 13. Update tugboat php image [skip ci] --- .tugboat/config.yml | 2 +- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.tugboat/config.yml b/.tugboat/config.yml index 6073e6b7..d880c85c 100644 --- a/.tugboat/config.yml +++ b/.tugboat/config.yml @@ -11,7 +11,7 @@ services: php: http: false - image: tugboatqa/php-nginx:8.1-fpm + image: tugboatqa/php-nginx:8.2-fpm default: true depends: diff --git a/composer.json b/composer.json index 0fcb549a..b40539c6 100644 --- a/composer.json +++ b/composer.json @@ -10,10 +10,10 @@ "psr-4": {"Lullabot\\Drainpipe\\Tests\\Functional\\": "tests/src/functional/"} }, "require": { - "php": "^8.1", + "php": "^8.2", "ext-json": "*", "composer-plugin-api": "^2.0", - "drush/drush": "^11|^12|^13", + "drush/drush": "13.x-dev", "symfony/yaml": "^6|^7", "twig/twig": "^3", "vlucas/phpdotenv": "^4|^5" From c645ae6193c4640217622984e11ea81ed2b24bf0 Mon Sep 17 00:00:00 2001 From: Luis Aveiga Date: Thu, 11 Jul 2024 11:35:20 -0500 Subject: [PATCH 7/7] not needed with drush 13 [skip ci] --- scaffold/Taskfile.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/scaffold/Taskfile.yml b/scaffold/Taskfile.yml index 8679e461..3df28cb6 100644 --- a/scaffold/Taskfile.yml +++ b/scaffold/Taskfile.yml @@ -26,9 +26,6 @@ tasks: cmds: # Replace this with a command to fetch your database. - ./vendor/bin/drush site:install -y - # Forcing the sessions table to exist - # otherwise, truncating it will fail. - - ./vendor/bin/drush uli | xargs wget --spider - echo "🧹 Sanitising database" - ./vendor/bin/drush sql:sanitize --yes