From 8dd8be969446285f737d6c819f43b76568795674 Mon Sep 17 00:00:00 2001 From: LogMANOriginal Date: Sun, 16 Jun 2019 19:15:28 +0200 Subject: [PATCH] [.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 --- .gitattributes | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index 13ebe2ca..36544021 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,18 +22,24 @@ *.RTF diff=astextplain # Ignore files in git archive (i.e. GitHub release builds) + ## Docker Dockerfile export-ignore .dockerignore export-ignore + ## Travis .travis.yml export-ignore + ## GitHub .github/ export-ignore + ## Git .gitattributes export-ignore .gitignore export-ignore + ## Scalingo scalingo.json export-ignore + ## RSS-Bridge phpunit.xml export-ignore phpcs.xml export-ignore @@ -42,8 +48,22 @@ tests/ export-ignore cache/.gitkeep export-ignore bridges/DemoBridge.php export-ignore bridges/FeedExpanderExampleBridge.php export-ignore + ## 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 -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