diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-27 15:21:35 +0100 |
|---|---|---|
| committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-27 15:21:35 +0100 |
| commit | 2481da00dcf049c96ee8a46c2b0f0ebd210d8f6c (patch) | |
| tree | 7737fb64ea4512e7a3f985d8110f56297b5e5e57 | |
| parent | 162954763e6f68e0cf4002822007683bde62fc25 (diff) | |
| parent | f06e268fc994cc91b55e390b3609d52e8737623d (diff) | |
| download | wallabag-2481da00dcf049c96ee8a46c2b0f0ebd210d8f6c.tar.gz wallabag-2481da00dcf049c96ee8a46c2b0f0ebd210d8f6c.tar.zst wallabag-2481da00dcf049c96ee8a46c2b0f0ebd210d8f6c.zip | |
Merge pull request #1731 from wallabag/v2-fix-travis-auth
Fix: #1703: 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..06e8d2f8 --- /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": "73d9411c719a0a56259dbfa16673793b39973091" | ||
| 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 |