From 4fea0786058538ff86b5ebce24d3a49f24cee7c4 Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 29 Nov 2021 13:37:45 -0500 Subject: [PATCH 01/10] use new CircleCI convenience image for PHP --- .circleci/config.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f22a701..4dc985e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: build: working_directory: ~/drupal-skeleton docker: - - image: circleci/php:7.3-node-browsers + - image: cimg/php:7.4-browsers - image: circleci/mysql:5.7-ram command: --max_allowed_packet=16M environment: @@ -23,14 +23,10 @@ jobs: - run: name: Install packages command: sudo apt-get install -y libpng-dev default-mysql-client - - run: - name: Install PHP extensions - command: sudo docker-php-ext-install pdo_mysql gd - run: name: Configure PHP command: | - echo "sendmail_path=/bin/true" | sudo tee -a "/usr/local/etc/php/php.ini" - echo "memory_limit=-1" | sudo tee -a "/usr/local/etc/php/php.ini" + echo "sendmail_path=/bin/true" | sudo tee -a "/etc/php.d/circleci.ini" - run: name: Create artifacts directory command: mkdir /tmp/artifacts From 57aa0183b3b33551c4667823a6119e5558e6fcf7 Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 29 Nov 2021 13:47:38 -0500 Subject: [PATCH 02/10] run apt-get update before install (libpng_dev is already installed by the Dockerfile) --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4dc985e..2c984f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: steps: - run: name: Install packages - command: sudo apt-get install -y libpng-dev default-mysql-client + command: sudo apt-get update && sudo apt-get install -y default-mysql-client - run: name: Configure PHP command: | From 1cb761de5c77e095f0e7d2fd01f75575c0b6d5a9 Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 29 Nov 2021 13:54:29 -0500 Subject: [PATCH 03/10] attempt to fix the build installation (maybe printf no longer appends a newline?) --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c984f7..60de185 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,7 +80,7 @@ jobs: - run: name: Install the-build in the project - command: printf 'http://drupal-skeleton.local\nother\nn' | vendor/bin/the-build-installer + command: printf 'http://drupal-skeleton.local\nother\nn\n' | vendor/bin/the-build-installer - run: name: Wait for DB From 9e91c963ab4e21f6dc0cc0ab02bb5edd328f9cbd Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 29 Nov 2021 14:03:37 -0500 Subject: [PATCH 04/10] respond to machine name prompt when installing the build --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 60de185..4bac1e6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,7 +80,7 @@ jobs: - run: name: Install the-build in the project - command: printf 'http://drupal-skeleton.local\nother\nn\n' | vendor/bin/the-build-installer + command: printf 'drupal-skeleton\nhttp://drupal-skeleton.local\nother\nn' | vendor/bin/the-build-installer - run: name: Wait for DB From 81ba345b417a5073824e14d40a5c73c8c3ad5276 Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 29 Nov 2021 14:18:02 -0500 Subject: [PATCH 05/10] use "acquia" environment since "other" does not set drupal.root during installation of the build --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4bac1e6..4750424 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,7 +80,7 @@ jobs: - run: name: Install the-build in the project - command: printf 'drupal-skeleton\nhttp://drupal-skeleton.local\nother\nn' | vendor/bin/the-build-installer + command: printf 'drupal-skeleton\nhttp://drupal-skeleton.local\nacquia\nn' | vendor/bin/the-build-installer - run: name: Wait for DB From fe6ef3d1398c7c28edf218580a717e4bc3a24786 Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 29 Nov 2021 14:22:49 -0500 Subject: [PATCH 06/10] temporarily fix composer.json mismatch with the-build installer while #118 is open --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4a34277..6d2362b 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "drupal/config_split": "^1.7", "drupal/core-composer-scaffold": "^9", "drupal/core-recommended": "^9", - "drupal/devel": "^3.0@dev", + "drupal/devel": "^3.0", "drupal/workbench": "^1.3", "drupal/workbench_tabs": "^1.5" }, From 70c1c1d4621690ab7f06a4358c07689d8a8f615e Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 29 Nov 2021 14:29:27 -0500 Subject: [PATCH 07/10] undo change to composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6d2362b..4a34277 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "drupal/config_split": "^1.7", "drupal/core-composer-scaffold": "^9", "drupal/core-recommended": "^9", - "drupal/devel": "^3.0", + "drupal/devel": "^3.0@dev", "drupal/workbench": "^1.3", "drupal/workbench_tabs": "^1.5" }, From f65d7835e078dcf1b359c1846cd353ac23170abf Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 29 Nov 2021 14:31:42 -0500 Subject: [PATCH 08/10] temporarily use branch of the-build with matching devel module version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4a34277..a4f6f34 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "require-dev": { "drupal/core-dev": "^9", "drupal/drupal-extension": "^4.1.0", - "palantirnet/the-build": "^4@alpha" + "palantirnet/the-build": "dev-circleci-convenience-image-update" }, "suggest": { "cweagans/composer-patches": "Try ^1.7. Apply patches to packages, especially Drupal.org contrib.", From 695e1a8af31810af80e214b723d520cc65ce1944 Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 29 Nov 2021 14:38:08 -0500 Subject: [PATCH 09/10] use pantheon as installation environment to test copy to web directory --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4750424..6fbd854 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,7 +80,7 @@ jobs: - run: name: Install the-build in the project - command: printf 'drupal-skeleton\nhttp://drupal-skeleton.local\nacquia\nn' | vendor/bin/the-build-installer + command: printf 'drupal-skeleton\nhttp://drupal-skeleton.local\npantheon\nn' | vendor/bin/the-build-installer - run: name: Wait for DB From ab6efab0855b60eb7f834ded4ff46c9896e3f1d7 Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Tue, 4 Jan 2022 16:35:15 -0500 Subject: [PATCH 10/10] Revert "temporarily use branch of the-build with matching devel module version" This reverts commit f65d7835e078dcf1b359c1846cd353ac23170abf. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1225142..e11fda3 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "require-dev": { "drupal/core-dev": "^9", "drupal/drupal-extension": "^4.1.0", - "palantirnet/the-build": "dev-circleci-convenience-image-update" + "palantirnet/the-build": "^4@alpha" }, "suggest": { "cweagans/composer-patches": "Try ^1.7. Apply patches to packages, especially Drupal.org contrib.",