diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-02-27 11:26:09 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-02-27 11:26:09 +0100 |
| commit | 6daadb6c447757e87c1be9fa6df9917cc834603d (patch) | |
| tree | f8d73f2cc2d253b46b125aa72ac0bb7cc7606e69 | |
| parent | 162954763e6f68e0cf4002822007683bde62fc25 (diff) | |
| download | wallabag-6daadb6c447757e87c1be9fa6df9917cc834603d.tar.gz wallabag-6daadb6c447757e87c1be9fa6df9917cc834603d.tar.zst wallabag-6daadb6c447757e87c1be9fa6df9917cc834603d.zip | |
Fix authentication for PR by external contributors
| -rw-r--r-- | .composer-auth.json | 7 | ||||
| -rw-r--r-- | .travis.yml | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/.composer-auth.json b/.composer-auth.json new file mode 100644 index 00000000..3f3f20b2 --- /dev/null +++ b/.composer-auth.json | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | { | ||
| 2 | "github-oauth": { | ||
| 3 | "github.com": "PLEASE DO NOT USE THIS TOKEN IN YOUR OWN PROJECTS/FORKS", | ||
| 4 | "github.com": "This token is reserved for testing the wallabag/wallabag repository", | ||
| 5 | "github.com": "dc690078d5c2effdbc5ca1a6a715ad5e9c075ff1" | ||
| 6 | } | ||
| 7 | } | ||
diff --git a/.travis.yml b/.travis.yml index 819d29fd..c6d371a5 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -47,6 +47,9 @@ before_script: | |||
| 47 | - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; | 47 | - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; |
| 48 | - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi; | 48 | - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi; |
| 49 | 49 | ||
| 50 | before_install: | ||
| 51 | - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; | ||
| 52 | |||
| 50 | script: | 53 | script: |
| 51 | - travis_wait composer update --no-interaction --no-progress | 54 | - travis_wait composer update --no-interaction --no-progress |
| 52 | - ant prepare-$DB | 55 | - ant prepare-$DB |