From 6daadb6c447757e87c1be9fa6df9917cc834603d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 27 Feb 2016 11:26:09 +0100 Subject: [PATCH 1/2] Fix authentication for PR by external contributors --- .composer-auth.json | 7 +++++++ .travis.yml | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 .composer-auth.json diff --git a/.composer-auth.json b/.composer-auth.json new file mode 100644 index 000000000..3f3f20b25 --- /dev/null +++ b/.composer-auth.json @@ -0,0 +1,7 @@ +{ + "github-oauth": { + "github.com": "PLEASE DO NOT USE THIS TOKEN IN YOUR OWN PROJECTS/FORKS", + "github.com": "This token is reserved for testing the wallabag/wallabag repository", + "github.com": "dc690078d5c2effdbc5ca1a6a715ad5e9c075ff1" + } +} diff --git a/.travis.yml b/.travis.yml index 819d29fdc..c6d371a50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,9 @@ before_script: - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi; +before_install: + - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; + script: - travis_wait composer update --no-interaction --no-progress - ant prepare-$DB From f06e268fc994cc91b55e390b3609d52e8737623d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 27 Feb 2016 14:07:04 +0100 Subject: [PATCH 2/2] Replace token by a no scope one --- .composer-auth.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.composer-auth.json b/.composer-auth.json index 3f3f20b25..06e8d2f83 100644 --- a/.composer-auth.json +++ b/.composer-auth.json @@ -2,6 +2,6 @@ "github-oauth": { "github.com": "PLEASE DO NOT USE THIS TOKEN IN YOUR OWN PROJECTS/FORKS", "github.com": "This token is reserved for testing the wallabag/wallabag repository", - "github.com": "dc690078d5c2effdbc5ca1a6a715ad5e9c075ff1" + "github.com": "73d9411c719a0a56259dbfa16673793b39973091" } }