From 7755a2bc954c1863db24f74075c4b13442a9099a Mon Sep 17 00:00:00 2001 From: byrond Date: Tue, 14 Apr 2020 15:00:20 -0400 Subject: [PATCH 1/4] install drupal-check on circle --- defaults/install/.circleci/config.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/defaults/install/.circleci/config.yml b/defaults/install/.circleci/config.yml index e97060bb..ff29de60 100644 --- a/defaults/install/.circleci/config.yml +++ b/defaults/install/.circleci/config.yml @@ -43,6 +43,19 @@ jobs: name: Configure URL in /etc/hosts command: echo 127.0.0.1 ${CIRCLE_PROJECT_REPONAME}.local | sudo tee -a /etc/hosts + # Note: phing and drupal-check have mutually exclusive requirements. + # It'd be better to add drupal-check as a dependency of the drupal project + # rather than as part of the virtual environment, but this will have to do + # for now. Also note, drupal-check is added as part of the-vagrant so it + # is available to run within our VM. + - run: + name: Install drupal-check + command: | + curl -O -L https://github.com/mglaman/drupal-check/releases/download/1.0.9/drupal-check.phar + mkdir --parents ~/bin + mv drupal-check.phar ~/bin/drupal-check + chmod +x ~/bin/drupal-check + # Composer package cache - restore_cache: keys: From 4fa89d6c2442f27b87586590fd451f71f3fe8e82 Mon Sep 17 00:00:00 2001 From: byrond Date: Tue, 14 Apr 2020 15:03:04 -0400 Subject: [PATCH 2/4] match circleci drupal-check installation with the-vagrant --- .circleci/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 24242e37..2e86012b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,7 +53,11 @@ jobs: # is available to run within our VM. - run: name: Install drupal-check - command: composer global require mglaman/drupal-check + command: | + curl -O -L https://github.com/mglaman/drupal-check/releases/download/1.0.9/drupal-check.phar + mkdir --parents ~/bin + mv drupal-check.phar ~/bin/drupal-check + chmod +x ~/bin/drupal-check # Composer package cache - restore_cache: From a1fe059919b84f5e97ed31318eb5504fc24aa90d Mon Sep 17 00:00:00 2001 From: byrond Date: Tue, 14 Apr 2020 15:11:40 -0400 Subject: [PATCH 3/4] remove drupal-check installation from circle config for testing the-build --- .circleci/config.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e86012b..a4233d29 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,19 +46,6 @@ jobs: name: Configure URL in /etc/hosts command: echo 127.0.0.1 ${CIRCLE_PROJECT_REPONAME}.local | sudo tee -a /etc/hosts - # Note: phing and drupal-check have mutually exclusive requirements. - # It'd be better to add drupal-check as a dependency of the drupal project - # rather than as part of the virtual environment, but this will have to do - # for now. Also note, drupal-check is added as part of the-vagrant so it - # is available to run within our VM. - - run: - name: Install drupal-check - command: | - curl -O -L https://github.com/mglaman/drupal-check/releases/download/1.0.9/drupal-check.phar - mkdir --parents ~/bin - mv drupal-check.phar ~/bin/drupal-check - chmod +x ~/bin/drupal-check - # Composer package cache - restore_cache: keys: From 7fd214fb6efe9c7c57271a87a389c54f5c666e18 Mon Sep 17 00:00:00 2001 From: Bec White Date: Thu, 30 Apr 2020 14:47:01 -0500 Subject: [PATCH 4/4] Update default config for drupal-check location on circle. --- defaults/install/the-build/build.circleci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/install/the-build/build.circleci.yml b/defaults/install/the-build/build.circleci.yml index 1a2d4620..4acab1ed 100644 --- a/defaults/install/the-build/build.circleci.yml +++ b/defaults/install/the-build/build.circleci.yml @@ -15,4 +15,4 @@ behat: args: "--profile=circleci --suite=default --strict --format=junit --out=/tmp/artifacts --tags=~@skipci" drupal-check: - bin: "/home/circleci/.composer/vendor/bin/drupal-check" + bin: "/home/circleci/bin/drupal-check"