diff options
| author | Aya Morisawa <AyaMorisawa4869@gmail.com> | 2017-03-01 19:27:25 +0900 |
|---|---|---|
| committer | Aya Morisawa <AyaMorisawa4869@gmail.com> | 2017-03-01 19:27:25 +0900 |
| commit | bad65b62eecd6ecd5166687b4ec380e7181c6bfd (patch) | |
| tree | ff1dfeff0f5fc3e4d2273447684c960b2afab4f0 | |
| parent | Update release.sh (diff) | |
| download | misskey-bad65b62eecd6ecd5166687b4ec380e7181c6bfd.tar.gz misskey-bad65b62eecd6ecd5166687b4ec380e7181c6bfd.tar.bz2 misskey-bad65b62eecd6ecd5166687b4ec380e7181c6bfd.zip | |
Update .travis.yml
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | .travis/release.sh | 32 |
2 files changed, 15 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index b6c1cd4fa9..eaaa80f9e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,4 +33,4 @@ before_script: after_success: - chmod u+x ./.travis/release.sh - - ./.travis/release.sh + - if [ $TRAVIS_BRANCH = "master" ] && [ $TRAVIS_PULL_REQUEST != "false" ]; then ./.travis/release.sh; else echo "Skipping releasing task"; fi diff --git a/.travis/release.sh b/.travis/release.sh index c7a04461e4..077e2c58ec 100644 --- a/.travis/release.sh +++ b/.travis/release.sh @@ -1,20 +1,16 @@ #!/bin/bash -if [ $TRAVIS_BRANCH = "master" ] && [ $TRAVIS_PULL_REQUEST != "false" ]; then - echo "Starting releasing task" - openssl aes-256-cbc -K $encrypted_ceda82069128_key -iv $encrypted_ceda82069128_iv -in ./.travis/travis_rsa.enc -out travis_rsa -d - cp travis_rsa ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config - git checkout -b release - cp -f ./.travis/.gitignore-release .gitignore - git add --all - git rm --cached `git ls-files --full-name -i --exclude-standard` - git config --global user.email "AyaMorisawa4869@gmail.com" - git config --global user.name "Aya Morisawa" - git commit -m "Release build for $TRAVIS_COMMIT" - git push -f git@github.com:syuilo/misskey release - echo "Finished releasing task" -else - echo "Skipping releasing task" -fi +echo "Starting releasing task" +openssl aes-256-cbc -K $encrypted_ceda82069128_key -iv $encrypted_ceda82069128_iv -in ./.travis/travis_rsa.enc -out travis_rsa -d +cp travis_rsa ~/.ssh/id_rsa +chmod 600 ~/.ssh/id_rsa +echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config +git checkout -b release +cp -f ./.travis/.gitignore-release .gitignore +git add --all +git rm --cached `git ls-files --full-name -i --exclude-standard` +git config --global user.email "AyaMorisawa4869@gmail.com" +git config --global user.name "Aya Morisawa" +git commit -m "Release build for $TRAVIS_COMMIT" +git push -f git@github.com:syuilo/misskey release +echo "Finished releasing task" |