Skip to content

Commit 80476bb

Browse files
committed
Use bin for symlinked binaries
1 parent b8077a9 commit 80476bb

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Ignore directories generated by Composer
2+
bin
23
vendor
34
web/core
45
web/modules/contrib

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ install:
1616
script:
1717
# Test stable release
1818
- cd $TRAVIS_BUILD_DIR/web
19-
- ./../vendor/bin/drush site-install --verbose --yes --db-url=sqlite://tmp/site.sqlite
19+
- ./bin/drush site-install --verbose --yes --db-url=sqlite://tmp/site.sqlite
2020
# Skip core/tests/Drupal/Tests/ComposerIntegrationTest.php because web/ has no composer.json
21-
- ./../vendor/bin/phpunit -c core --exclude-group Composer
21+
- ./bin/phpunit -c core --exclude-group Composer
2222

2323
# Test dev release
2424
- cd $TRAVIS_BUILD_DIR
2525
- composer --verbose require --no-update drupal/core:8.0.x-dev
2626
- composer --verbose update
2727
- cd $TRAVIS_BUILD_DIR/web
28-
- ./../vendor/bin/drush site-install --verbose --yes --db-url=sqlite://tmp/site.sqlite
28+
- ./bin/drush site-install --verbose --yes --db-url=sqlite://tmp/site.sqlite
2929
# Skip core/tests/Drupal/Tests/ComposerIntegrationTest.php because web/ has no composer.json
30-
- ./../vendor/bin/phpunit -c core --exclude-group Composer
30+
- ./bin/phpunit -c core --exclude-group Composer

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,8 @@
3636
"web/themes/contrib/{$name}": ["type:drupal-theme"],
3737
"web/drush/commands/{$name}": ["type:drupal-drush"]
3838
}
39+
},
40+
"config": {
41+
"bin-dir": "bin"
3942
}
4043
}

0 commit comments

Comments
 (0)