Skip to content

Use pom.xml for repoSlug #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ctrueden merged 3 commits into from
Oct 27, 2017
Merged

Use pom.xml for repoSlug #14

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e08f110
Use pom.xml for repoSlug
hadim Oct 25, 2017
61166d7
Add repoSlug to travis encrypt-file
hadim Oct 25, 2017
d6b8e2f
Use --repo with the travis encrypt command
hadim Oct 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions travisify.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<connection>' 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"
Expand Down Expand Up @@ -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

@ctrueden ctrueden Oct 27, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this change, I think the echo yes | is no longer necessary. I'll remove it in the following commit.

done <"$varsFile"
$EXEC git commit "$travisConfig" -m "Travis: add encrypted environment variables"
else
Expand All @@ -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"
Expand Down