diff --git a/.travis.yml b/.travis.yml index dcfbff05c..74886b927 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,30 +6,6 @@ language: node_js node_js: - "7.6.0" -services: - - mongodb - - redis-server - -before_script: - - mkdir ./.config - - cp ./.ci-files/default.yml ./.config - - cp ./.ci-files/test.yml ./.config - - npm run build - -after_success: - - openssl aes-256-cbc -K $encrypted_ceda82069128_key -iv $encrypted_ceda82069128_iv -in .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 .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" - - if [ $TRAVIS_BRANCH = "master" ]; then git push -f git@github.com:syuilo/misskey release; fi - env: - CXX=g++-4.8 NODE_ENV=production @@ -44,3 +20,27 @@ addons: cache: directories: - node_modules + +services: + - mongodb + - redis-server + +before_script: + - mkdir ./.config + - cp ./.travis/default.yml ./.config + - cp ./.travis/test.yml ./.config + - npm run build + +after_success: + - 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" + - if [ $TRAVIS_BRANCH = "master" ] && [ $TRAVIS_PULL_REQUEST != "false" ]; then git push -f git@github.com:syuilo/misskey release; fi diff --git a/.gitignore-release b/.travis/.gitignore-release similarity index 100% rename from .gitignore-release rename to .travis/.gitignore-release diff --git a/.ci-files/default.yml b/.travis/default.yml similarity index 100% rename from .ci-files/default.yml rename to .travis/default.yml diff --git a/.ci-files/test.yml b/.travis/test.yml similarity index 100% rename from .ci-files/test.yml rename to .travis/test.yml diff --git a/.travis_rsa.enc b/.travis/travis_rsa.enc similarity index 100% rename from .travis_rsa.enc rename to .travis/travis_rsa.enc