From d62f27621f145b73f2aa8fdfe2759a5dd82cfd96 Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 29 Nov 2021 09:58:46 -0500 Subject: [PATCH 01/16] use new CircleCI convenience image for PHP --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ade03a5a..efd8068c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: build: working_directory: ~/example docker: - - image: circleci/php:7.4-node-browsers + - image: cimg/php:7.4-browsers - image: circleci/mysql:5.7-ram command: --max_allowed_packet=16M environment: From b3d9ebe3e086f090e1c12fb51d4aaeacdc41bb51 Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 29 Nov 2021 10:27:41 -0500 Subject: [PATCH 02/16] use pecl to install PHP extensions --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index efd8068c..b6da94a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,7 @@ jobs: sudo apt-get install -y libpng-dev default-mysql-client - run: name: Install PHP extensions - command: sudo docker-php-ext-install pdo_mysql gd + command: sudo pecl install pdo_mysql gd - run: name: Configure PHP command: | From 72a4e9cb30929207cd35c016f45401613a1d1016 Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 29 Nov 2021 11:12:42 -0500 Subject: [PATCH 03/16] pdo_mysql and gd are built into PHP of the Docker image --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b6da94a6..f92e622a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,9 +24,6 @@ jobs: command: | sudo apt-get update sudo apt-get install -y libpng-dev default-mysql-client - - run: - name: Install PHP extensions - command: sudo pecl install pdo_mysql gd - run: name: Configure PHP command: | From 323ed8d9da4881ff1898c62a83b1acfbe9e8aada Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 29 Nov 2021 12:10:25 -0500 Subject: [PATCH 04/16] update php ini config path (memory limit setting already included by Dockerfile) --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f92e622a..aacfeb74 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,8 +27,7 @@ jobs: - 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 1e4c62c707d635b58154e36a9ee3083691dcb25c Mon Sep 17 00:00:00 2001 From: byrond Date: Mon, 29 Nov 2021 12:20:08 -0500 Subject: [PATCH 05/16] temporary fix for drupal-first-install while #176 is open --- targets/drupal.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/drupal.xml b/targets/drupal.xml index 91ddcaa0..b039fdc9 100644 --- a/targets/drupal.xml +++ b/targets/drupal.xml @@ -260,7 +260,7 @@ Or, you can specify the export file directly: - + From 6815fb87fee02db0d73ccc73caa42fad082d2302 Mon Sep 17 00:00:00 2001 From: byrond Date: Fri, 14 Jan 2022 14:53:36 -0500 Subject: [PATCH 06/16] use cimg/mysql docker image --- .circleci/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aacfeb74..fd570508 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: working_directory: ~/example docker: - image: cimg/php:7.4-browsers - - image: circleci/mysql:5.7-ram + - image: cimg/mysql:5.7 command: --max_allowed_packet=16M environment: MYSQL_ALLOW_EMPTY_PASSWORD: yes @@ -22,8 +22,7 @@ jobs: - run: name: Install packages command: | - sudo apt-get update - sudo apt-get install -y libpng-dev default-mysql-client + sudo sudo apt-get update && apt-get install -y libpng-dev default-mysql-client - run: name: Configure PHP command: | From 383c5a41816fb1da1a959f0e2b82ac3a9f3371bd Mon Sep 17 00:00:00 2001 From: byrond Date: Fri, 14 Jan 2022 14:57:31 -0500 Subject: [PATCH 07/16] make identical changes to distributed config.yml --- defaults/install/.circleci/config.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/defaults/install/.circleci/config.yml b/defaults/install/.circleci/config.yml index 96d54944..9c562a60 100644 --- a/defaults/install/.circleci/config.yml +++ b/defaults/install/.circleci/config.yml @@ -3,8 +3,8 @@ jobs: build: working_directory: ~/${projectname} docker: - - image: circleci/php:7.3-node-browsers - - image: circleci/mysql:5.7-ram + - image: cimg/php:7.4-node-browsers + - image: cimg/mysql:5.7 command: --max_allowed_packet=16M environment: MYSQL_ALLOW_EMPTY_PASSWORD: yes @@ -20,8 +20,7 @@ jobs: - run: name: Install packages command: | - sudo apt-get update - sudo apt-get install -y libpng-dev default-mysql-client + sudo sudo apt-get update && apt-get install -y libpng-dev default-mysql-client - run: name: Install nvm command: | @@ -30,14 +29,10 @@ jobs: touch $BASH_ENV echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV - - 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 8f6fe19a9dddf54ac3234821927820045160f383 Mon Sep 17 00:00:00 2001 From: byrond Date: Fri, 14 Jan 2022 15:04:25 -0500 Subject: [PATCH 08/16] shaka, when the walls fell --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fd570508..ed79f8a2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: - run: name: Install packages command: | - sudo sudo apt-get update && apt-get install -y libpng-dev default-mysql-client + sudo apt-get update && apt-get install -y libpng-dev default-mysql-client - run: name: Configure PHP command: | From d6cea6cdb21825f04bb87f2395cf84f4e97f8d0e Mon Sep 17 00:00:00 2001 From: byrond Date: Fri, 14 Jan 2022 15:07:20 -0500 Subject: [PATCH 09/16] update distributed config.yml --- defaults/install/.circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/install/.circleci/config.yml b/defaults/install/.circleci/config.yml index 9c562a60..11555426 100644 --- a/defaults/install/.circleci/config.yml +++ b/defaults/install/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: - run: name: Install packages command: | - sudo sudo apt-get update && apt-get install -y libpng-dev default-mysql-client + sudo apt-get update && apt-get install -y libpng-dev default-mysql-client - run: name: Install nvm command: | From 8bafc7c8c1633a79683d38fc3dfcc20d63f5d661 Mon Sep 17 00:00:00 2001 From: byrond Date: Fri, 14 Jan 2022 15:09:21 -0500 Subject: [PATCH 10/16] shaka, WHEN THE WALLS FELL --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ed79f8a2..123f9da1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: - run: name: Install packages command: | - sudo apt-get update && apt-get install -y libpng-dev default-mysql-client + sudo apt-get update && sudo apt-get install -y libpng-dev default-mysql-client - run: name: Configure PHP command: | From 84cb636dea5b778a0d4077be27894f9989d93e5e Mon Sep 17 00:00:00 2001 From: byrond Date: Fri, 14 Jan 2022 15:09:46 -0500 Subject: [PATCH 11/16] update distributed config.yml --- defaults/install/.circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/install/.circleci/config.yml b/defaults/install/.circleci/config.yml index 11555426..a50d9ac3 100644 --- a/defaults/install/.circleci/config.yml +++ b/defaults/install/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: - run: name: Install packages command: | - sudo apt-get update && apt-get install -y libpng-dev default-mysql-client + sudo apt-get update && sudo apt-get install -y libpng-dev default-mysql-client - run: name: Install nvm command: | From 81d6477d193c15754759217e450c804d2fb9fc23 Mon Sep 17 00:00:00 2001 From: byrond Date: Fri, 14 Jan 2022 15:16:49 -0500 Subject: [PATCH 12/16] Update config.yml --- defaults/install/.circleci/config.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/defaults/install/.circleci/config.yml b/defaults/install/.circleci/config.yml index a50d9ac3..ddc6dbea 100644 --- a/defaults/install/.circleci/config.yml +++ b/defaults/install/.circleci/config.yml @@ -1,4 +1,10 @@ -version: 2 +version: 2.1 +# To use browsers on CircleCI, uncomment the lines below and add steps to install them. +# For example, add these to `jobs.build.steps`: +# - browser-tools/install-chrome +# - browser-tools/install-chromedriver +# orbs: +# browser-tools: circleci/browser-tools@1.2.3 jobs: build: working_directory: ~/${projectname} From b62d5b80c9d0a49b05c63baa07b5e2f614e40ffa Mon Sep 17 00:00:00 2001 From: byrond Date: Fri, 14 Jan 2022 15:17:49 -0500 Subject: [PATCH 13/16] update circle api version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 123f9da1..423974f5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ # This CircleCI configuration is for testing the-build itself. For the configuration # installed in projects, see defaults/install/.circleci/config.yml -version: 2 +version: 2.1 jobs: build: working_directory: ~/example From 8f515f5a9fce6a12a92eb2e832273753770ef480 Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Thu, 20 Jan 2022 09:48:24 -0500 Subject: [PATCH 14/16] update docker image in deploy examples --- defaults/install/.circleci/deploy-acquia-example | 2 +- defaults/install/.circleci/deploy-pantheon.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/install/.circleci/deploy-acquia-example b/defaults/install/.circleci/deploy-acquia-example index 25f77836..2772b725 100644 --- a/defaults/install/.circleci/deploy-acquia-example +++ b/defaults/install/.circleci/deploy-acquia-example @@ -21,7 +21,7 @@ deploy: working_directory: ~/project docker: - - image: circleci/php:7.2-node-browsers + - image: cimg/php:7.4-node-browsers environment: - NODE_VERSION: 8 - GITHUB_PUBKEY: "github.com,192.30.253.113 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" diff --git a/defaults/install/.circleci/deploy-pantheon.example b/defaults/install/.circleci/deploy-pantheon.example index 37ef9fb8..1954e086 100644 --- a/defaults/install/.circleci/deploy-pantheon.example +++ b/defaults/install/.circleci/deploy-pantheon.example @@ -23,7 +23,7 @@ deploy: working_directory: ~/project docker: - - image: circleci/php:7.2-node-browsers + - image: cimg/php:7.4-node-browsers environment: - NODE_VERSION: 8 - GITHUB_PUBKEY: "github.com,192.30.253.113 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" From 67b02a28d8abec9bb3538176af63cb761470960a Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Thu, 20 Jan 2022 09:52:05 -0500 Subject: [PATCH 15/16] fix typo in docker image for deploy examples --- defaults/install/.circleci/deploy-acquia-example | 2 +- defaults/install/.circleci/deploy-pantheon.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/install/.circleci/deploy-acquia-example b/defaults/install/.circleci/deploy-acquia-example index 2772b725..be260ab6 100644 --- a/defaults/install/.circleci/deploy-acquia-example +++ b/defaults/install/.circleci/deploy-acquia-example @@ -21,7 +21,7 @@ deploy: working_directory: ~/project docker: - - image: cimg/php:7.4-node-browsers + - image: cimg/php:7.4-browsers environment: - NODE_VERSION: 8 - GITHUB_PUBKEY: "github.com,192.30.253.113 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" diff --git a/defaults/install/.circleci/deploy-pantheon.example b/defaults/install/.circleci/deploy-pantheon.example index 1954e086..3feab4e3 100644 --- a/defaults/install/.circleci/deploy-pantheon.example +++ b/defaults/install/.circleci/deploy-pantheon.example @@ -23,7 +23,7 @@ deploy: working_directory: ~/project docker: - - image: cimg/php:7.4-node-browsers + - image: cimg/php:7.4-browsers environment: - NODE_VERSION: 8 - GITHUB_PUBKEY: "github.com,192.30.253.113 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" From 67814e01e90aac018927cbb4ac7b221fc68b73cc Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Thu, 20 Jan 2022 10:05:05 -0500 Subject: [PATCH 16/16] make deploy examples consistent with config.yml --- defaults/install/.circleci/deploy-acquia-example | 7 ++----- defaults/install/.circleci/deploy-pantheon.example | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/defaults/install/.circleci/deploy-acquia-example b/defaults/install/.circleci/deploy-acquia-example index be260ab6..2988e907 100644 --- a/defaults/install/.circleci/deploy-acquia-example +++ b/defaults/install/.circleci/deploy-acquia-example @@ -33,7 +33,7 @@ - add_ssh_keys - run: name: Install packages - command: sudo apt-get install -y libpng-dev + command: sudo apt-get update && sudo apt-get install -y libpng-dev - run: name: Install nvm @@ -43,13 +43,10 @@ touch $BASH_ENV echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV - - run: - name: Install PHP extensions - command: sudo docker-php-ext-install gd - run: name: Configure PHP command: | - 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: Configure Git command: | diff --git a/defaults/install/.circleci/deploy-pantheon.example b/defaults/install/.circleci/deploy-pantheon.example index 3feab4e3..15c2d583 100644 --- a/defaults/install/.circleci/deploy-pantheon.example +++ b/defaults/install/.circleci/deploy-pantheon.example @@ -35,7 +35,7 @@ - add_ssh_keys - run: name: Install packages - command: sudo apt-get install -y libpng-dev + command: sudo apt-get update && sudo apt-get install -y libpng-dev - run: name: Install nvm @@ -45,13 +45,10 @@ touch $BASH_ENV echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV - - run: - name: Install PHP extensions - command: sudo docker-php-ext-install gd - run: name: Configure PHP command: | - 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: Configure Git command: |