Skip to content

Commit 84cd8e4

Browse files
authored
Merge pull request #14 from hadim/reposlug
Use pom.xml for repoSlug
2 parents 03621c8 + d6b8e2f commit 84cd8e4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

travisify.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ process() {
6666
cd "$1"
6767

6868
# -- Git sanity checks --
69-
repoSlug=$(git remote -v | grep origin | head -n1 | sed 's/.*github.com.\([^ ]*\) .*/\1/' | sed 's/\.git$//')
69+
repoSlug=$(grep '<connection>' pom.xml 2>/dev/null | sed 's/[^>]*>//' | sed 's/<.*//' | cut -d'/' -f4,5)
7070
test "$repoSlug" && info "Repository = $repoSlug" || die 'Could not determine GitHub repository slug'
7171
git fetch >/dev/null
7272
git diff-index --quiet HEAD -- || die "Dirty working copy"
@@ -166,7 +166,7 @@ EOL
166166
'#'*) continue;;
167167
esac
168168
info "Encrypting ${p%%=*}"
169-
echo yes | $EXEC travis encrypt "$p" --add env.global
169+
echo yes | $EXEC travis encrypt "$p" --add env.global --repo $repoSlug
170170
done <"$varsFile"
171171
$EXEC git commit "$travisConfig" -m "Travis: add encrypted environment variables"
172172
else
@@ -179,7 +179,7 @@ EOL
179179
info "Encrypting $signingKeyDestFile"
180180
# NB: We have to copy the file first, so that --add does the right thing.
181181
$EXEC cp "$signingKeySourceFile" "$signingKeyDestFile"
182-
$EXEC travis encrypt-file "$signingKeyDestFile" "$signingKeyDestFile.enc" --add
182+
$EXEC travis encrypt-file "$signingKeyDestFile" "$signingKeyDestFile.enc" --add --repo $repoSlug
183183
$EXEC rm -f "$signingKeyDestFile"
184184
$EXEC git add "$travisConfig" "$signingKeyDestFile.enc"
185185
$EXEC git commit -m "Travis: add encrypted GPG signing keypair"

0 commit comments

Comments
 (0)