From 26b9e3a84d69e169725c7b64c5c97d78f4ec80df Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Thu, 24 Dec 2020 11:00:51 +0000
Subject: [PATCH] Change bin directory to bin

---
 .github/workflows/ci.yml           | 8 ++++----
 composer.json                      | 1 +
 tools/ansible/provision.yml        | 2 +-
 tools/ansible/vars/deploy_vars.yml | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d04f4f3..c31f92e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: Install Drupal
         run: >
-          vendor/bin/drush --root=$(pwd)/web
+          bin/drush --root=$(pwd)/web
           site:install -y
           --existing-config
           --db-url=sqlite://sites/default/files/.ht.sqlite
@@ -135,7 +135,7 @@ jobs:
         if: matrix.test-types == 'functional'
 
       - name: Execute tests
-        run: vendor/bin/phpunit --testdox --colors=always --testsuite=${{ matrix.test-types }}
+        run: bin/phpunit --testdox --colors=always --testsuite=${{ matrix.test-types }}
         env:
           SIMPLETEST_BASE_URL: http://localhost:8000
 
@@ -170,7 +170,7 @@ jobs:
         run: composer install --prefer-dist --no-interaction --no-suggest
 
       - name: Run checks
-        run: vendor/bin/phpcs -s --warning-severity=6
+        run: bin/phpcs -s --warning-severity=6
 
   phpstan:
     runs-on: ubuntu-latest
@@ -203,4 +203,4 @@ jobs:
         run: composer install --prefer-dist --no-interaction --no-suggest
 
       - name: Run checks
-        run: vendor/bin/phpstan analyze
+        run: bin/phpstan analyze
diff --git a/composer.json b/composer.json
index af61378..632ff7c 100644
--- a/composer.json
+++ b/composer.json
@@ -58,6 +58,7 @@
     "prefer-stable": true,
     "scripts": {},
     "config": {
+        "bin-dir": "bin",
         "sort-packages": true
     },
     "extra": {
diff --git a/tools/ansible/provision.yml b/tools/ansible/provision.yml
index bbebf24..4cdd1eb 100644
--- a/tools/ansible/provision.yml
+++ b/tools/ansible/provision.yml
@@ -75,7 +75,7 @@
         name: Drupal cron - oliverdavies.uk
         minute: '*/5'
         job: >
-          {{ project_root_path }}/{{ ansistrano_current_dir }}/vendor/bin/drush core-cron
+          {{ project_root_path }}/{{ ansistrano_current_dir }}/bin/drush core-cron
           --root={{ project_root_path }}/{{ ansistrano_current_dir }}/{{ project_web_dir }}
           --uri https://www.oliverdavies.uk
           --quiet
diff --git a/tools/ansible/vars/deploy_vars.yml b/tools/ansible/vars/deploy_vars.yml
index 05abe47..c0e2cb0 100644
--- a/tools/ansible/vars/deploy_vars.yml
+++ b/tools/ansible/vars/deploy_vars.yml
@@ -16,7 +16,7 @@ app_hash_salt: '{{ vault_app_hash_salt }}'
 
 zapier_post_tweet_url: '{{ vault_zapier_post_tweet_url }}'
 
-release_drush_path: '{{ ansistrano_release_path.stdout }}/vendor/bin/drush'
+release_drush_path: '{{ ansistrano_release_path.stdout }}/bin/drush'
 release_web_path: '{{ ansistrano_release_path.stdout }}/{{ project_web_dir }}'
 release_theme_path: '{{ release_web_path }}/themes/custom/opdavies'