[.gitattributes] Keep files in export for Heroku

Heroku requires the file `app.json` as well as the composer files
`composer.json` and `composer.lock` to deploy a service. Deploy
doesn't work if these files are ignored during export (because of
the way this service deploys projects).

This commit adds comments to .gitattributes to prevent this issue
from re-appearing in the future. All affected lines are commented
out.

Also added some spacing for better readability.

References #1165
This commit is contained in:
LogMANOriginal 2019-06-16 19:15:28 +02:00 committed by GitHub
parent dfa9c651cd
commit 8dd8be9694
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

26
.gitattributes vendored
View file

@ -22,18 +22,24 @@
*.RTF diff=astextplain *.RTF diff=astextplain
# Ignore files in git archive (i.e. GitHub release builds) # Ignore files in git archive (i.e. GitHub release builds)
## Docker ## Docker
Dockerfile export-ignore Dockerfile export-ignore
.dockerignore export-ignore .dockerignore export-ignore
## Travis ## Travis
.travis.yml export-ignore .travis.yml export-ignore
## GitHub ## GitHub
.github/ export-ignore .github/ export-ignore
## Git ## Git
.gitattributes export-ignore .gitattributes export-ignore
.gitignore export-ignore .gitignore export-ignore
## Scalingo ## Scalingo
scalingo.json export-ignore scalingo.json export-ignore
## RSS-Bridge ## RSS-Bridge
phpunit.xml export-ignore phpunit.xml export-ignore
phpcs.xml export-ignore phpcs.xml export-ignore
@ -42,8 +48,22 @@ tests/ export-ignore
cache/.gitkeep export-ignore cache/.gitkeep export-ignore
bridges/DemoBridge.php export-ignore bridges/DemoBridge.php export-ignore
bridges/FeedExpanderExampleBridge.php export-ignore bridges/FeedExpanderExampleBridge.php export-ignore
## Composer ## Composer
composer.json export-ignore #
composer.lock export-ignore # Keep the following lines commented out. Heroku does
# not function if the composer files are ignored during
# export. For more information see
# https://github.com/rss-bridge/rss-bridge/issues/1165
#
# composer.json export-ignore
# composer.lock export-ignore
## Heroku ## Heroku
app.json export-ignore #
# Keep the following line commented out. Heroku does
# not function if app.json is ignored during export.
# For more information see
# https://github.com/rss-bridge/rss-bridge/issues/1165
#
# app.json export-ignore