Change bin directory to bin

This commit is contained in:
Oliver Davies 2020-12-24 11:00:51 +00:00
parent 9aaf62fce3
commit 26b9e3a84d
4 changed files with 7 additions and 6 deletions

View file

@ -44,7 +44,7 @@ jobs:
- name: Install Drupal - name: Install Drupal
run: > run: >
vendor/bin/drush --root=$(pwd)/web bin/drush --root=$(pwd)/web
site:install -y site:install -y
--existing-config --existing-config
--db-url=sqlite://sites/default/files/.ht.sqlite --db-url=sqlite://sites/default/files/.ht.sqlite
@ -135,7 +135,7 @@ jobs:
if: matrix.test-types == 'functional' if: matrix.test-types == 'functional'
- name: Execute tests - 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: env:
SIMPLETEST_BASE_URL: http://localhost:8000 SIMPLETEST_BASE_URL: http://localhost:8000
@ -170,7 +170,7 @@ jobs:
run: composer install --prefer-dist --no-interaction --no-suggest run: composer install --prefer-dist --no-interaction --no-suggest
- name: Run checks - name: Run checks
run: vendor/bin/phpcs -s --warning-severity=6 run: bin/phpcs -s --warning-severity=6
phpstan: phpstan:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -203,4 +203,4 @@ jobs:
run: composer install --prefer-dist --no-interaction --no-suggest run: composer install --prefer-dist --no-interaction --no-suggest
- name: Run checks - name: Run checks
run: vendor/bin/phpstan analyze run: bin/phpstan analyze

View file

@ -58,6 +58,7 @@
"prefer-stable": true, "prefer-stable": true,
"scripts": {}, "scripts": {},
"config": { "config": {
"bin-dir": "bin",
"sort-packages": true "sort-packages": true
}, },
"extra": { "extra": {

View file

@ -75,7 +75,7 @@
name: Drupal cron - oliverdavies.uk name: Drupal cron - oliverdavies.uk
minute: '*/5' minute: '*/5'
job: > 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 }} --root={{ project_root_path }}/{{ ansistrano_current_dir }}/{{ project_web_dir }}
--uri https://www.oliverdavies.uk --uri https://www.oliverdavies.uk
--quiet --quiet

View file

@ -16,7 +16,7 @@ app_hash_salt: '{{ vault_app_hash_salt }}'
zapier_post_tweet_url: '{{ vault_zapier_post_tweet_url }}' 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_web_path: '{{ ansistrano_release_path.stdout }}/{{ project_web_dir }}'
release_theme_path: '{{ release_web_path }}/themes/custom/opdavies' release_theme_path: '{{ release_web_path }}/themes/custom/opdavies'