From e08f11036c79bb29615168c0a617de188ecd0d5d Mon Sep 17 00:00:00 2001 From: Hadrien Mary Date: Wed, 25 Oct 2017 17:09:16 -0400 Subject: [PATCH 1/3] Use pom.xml for repoSlug --- travisify.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travisify.sh b/travisify.sh index 4fcf545..a63ed61 100755 --- a/travisify.sh +++ b/travisify.sh @@ -66,7 +66,7 @@ process() { cd "$1" # -- Git sanity checks -- - repoSlug=$(git remote -v | grep origin | head -n1 | sed 's/.*github.com.\([^ ]*\) .*/\1/' | sed 's/\.git$//') + repoSlug=$(grep '' pom.xml 2>/dev/null | sed 's/[^>]*>//' | sed 's/<.*//' | cut -d'/' -f4,5) test "$repoSlug" && info "Repository = $repoSlug" || die 'Could not determine GitHub repository slug' git fetch >/dev/null git diff-index --quiet HEAD -- || die "Dirty working copy" From 61166d779b23d88880dc9b2729fbdd457b1346ae Mon Sep 17 00:00:00 2001 From: Hadrien Mary Date: Wed, 25 Oct 2017 17:24:16 -0400 Subject: [PATCH 2/3] Add repoSlug to travis encrypt-file --- travisify.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travisify.sh b/travisify.sh index a63ed61..9600bc5 100755 --- a/travisify.sh +++ b/travisify.sh @@ -179,7 +179,7 @@ EOL info "Encrypting $signingKeyDestFile" # NB: We have to copy the file first, so that --add does the right thing. $EXEC cp "$signingKeySourceFile" "$signingKeyDestFile" - $EXEC travis encrypt-file "$signingKeyDestFile" "$signingKeyDestFile.enc" --add + $EXEC travis encrypt-file "$signingKeyDestFile" "$signingKeyDestFile.enc" --add --repo $repoSlug $EXEC rm -f "$signingKeyDestFile" $EXEC git add "$travisConfig" "$signingKeyDestFile.enc" $EXEC git commit -m "Travis: add encrypted GPG signing keypair" From d6b8e2f2df02d331a7b336dd9af3616514a9d6c5 Mon Sep 17 00:00:00 2001 From: Hadrien Mary Date: Wed, 25 Oct 2017 17:55:33 -0400 Subject: [PATCH 3/3] Use --repo with the travis encrypt command --- travisify.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travisify.sh b/travisify.sh index 9600bc5..3704003 100755 --- a/travisify.sh +++ b/travisify.sh @@ -166,7 +166,7 @@ EOL '#'*) continue;; esac info "Encrypting ${p%%=*}" - echo yes | $EXEC travis encrypt "$p" --add env.global + echo yes | $EXEC travis encrypt "$p" --add env.global --repo $repoSlug done <"$varsFile" $EXEC git commit "$travisConfig" -m "Travis: add encrypted environment variables" else