Skip to content

Commit

Permalink
change default branch
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k committed Dec 29, 2016
1 parent 764ba78 commit 96ed1e8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/template.properties
Expand Up @@ -4,5 +4,5 @@ scala=2.10.3
github=foundweekends/pamflet
languages=en,ja
twitter=#pamflet
github_docs=https://github.com/foundweekends/pamflet/tree/0.7.0/docs
github_docs=https://github.com/foundweekends/pamflet/tree/master/docs
#pamflet.arrow=↬
2 changes: 1 addition & 1 deletion publish.sh
@@ -1,6 +1,6 @@
#!/bin/bash -e

if [[ "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "0.7.0" && "${TRAVIS_REPO_SLUG}" == "foundweekends/pamflet" ]]; then
if [[ "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_REPO_SLUG}" == "foundweekends/pamflet" ]]; then
echo -e "Host github.com\n\tStrictHostKeyChecking no\nIdentityFile ~/.ssh/deploy.key\n" >> ~/.ssh/config
openssl aes-256-cbc -k "$SERVER_KEY" -in deploy_key.enc -d -a -out deploy.key
cp deploy.key ~/.ssh/
Expand Down

0 comments on commit 96ed1e8

Please sign in to comment.