Use the drupal-check bin installed by Composer.

palantirnet · Jan 7, 2022 · 56d3efd · 56d3efd
1 parent a12d851
commit 56d3efd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/defaults.yml b/defaults.yml
@@ -267,11 +267,11 @@ phpmd:
 # Configuration for checking the site with the Drupal Checker code linter.
 #
 # @see https://github.com/mglaman/drupal-check
-# These values are used in the defaults/build.xml template.
+# @see defaults/build.xml
 drupal-check:
-  # Location of the drupal-check script. This script is currently installed globally
-  # because of repository-level composer conflicts.
-  bin: "~/bin/drupal-check"
+  # Location of the drupal-check script. This shouldn't need to be overridden,
+  # but it is used in the defaults/build.xml template.
+  bin: "vendor/bin/drupal-check"
   # Comma separated list of directories
   directories: "${drupal.root}/modules/custom/,${drupal.root}/themes/custom/"
 

diff --git a/defaults/install/build.xml b/defaults/install/build.xml
@@ -134,8 +134,9 @@
     <!-- Separated out so that we can use foreach. drupal-check only accepts a single directory argument. -->
     <target name="drupal-check" hidden="true">
         <fail unless="drupal-check.dir" />
-        <property name="drupal-check.bin" value="~/bin/drupal-check" />
+        <property name="drupal-check.bin" value="vendor/bin/drupal-check" />
         <property name="drupal-check.command" value="${drupal-check.bin} ${drupal-check.dir}" />
+
         <echo msg="$> ${drupal-check.command}" />
         <exec command="${drupal-check.command}" logoutput="true" checkreturn="true" />
     </target>

diff --git a/defaults/install/the-build/build.circleci.yml b/defaults/install/the-build/build.circleci.yml
@@ -13,6 +13,3 @@ drupal:
 
 behat:
   args: "--profile=circleci --suite=default --strict --format=junit --out=/tmp/artifacts --tags=~@skipci"
-
-drupal-check:
-  bin: "/home/circleci/bin/drupal-check"
diff --git a/defaults/install/the-build/build.yml b/defaults/install/the-build/build.yml
@@ -53,13 +53,6 @@ drupal:
 behat:
   args: "--suite=default --strict"
 
-# Configuration for checking the site with the Drupal Checker code linter.
-drupal-check:
-  # Location of the drupal-check script. This script is currently installed globally
-  # on the-vagrant because of repository-level composer conflicts.
-  bin: "~/bin/drupal-check"
-
-
 # To build an artifact from your code, add the URL to your artifact git repository.
 # @see https://github.com/palantirnet/the-build/blob/release-2.0/defaults.yml
 #