From c5697535e2be3965034b1cea94a03e7bfee9b733 Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Tue, 28 Feb 2017 20:41:16 +0900
Subject: [PATCH 1/2] Update .travis.yml

---
 .travis.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dcfbff05c..0c9cc611b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,21 @@ language: node_js
 node_js:
   - "7.6.0"
 
+env:
+  - CXX=g++-4.8 NODE_ENV=production
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
+      - graphicsmagick
+
+cache:
+  directories:
+    - node_modules
+
 services:
   - mongodb
   - redis-server
@@ -28,19 +43,4 @@ after_success:
   - 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
-
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
-      - graphicsmagick
-
-cache:
-  directories:
-    - node_modules
+  - if [ $TRAVIS_BRANCH = "master" ] && [ $TRAVIS_PULL_REQUEST != "false" ]; then git push -f git@github.com:syuilo/misskey release; fi

From db3671415926ff586002277545c55013520e7bfd Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Tue, 28 Feb 2017 20:44:03 +0900
Subject: [PATCH 2/2] Clean up

---
 .travis.yml                                      | 10 +++++-----
 .gitignore-release => .travis/.gitignore-release |  0
 {.ci-files => .travis}/default.yml               |  0
 {.ci-files => .travis}/test.yml                  |  0
 .travis_rsa.enc => .travis/travis_rsa.enc        |  0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename .gitignore-release => .travis/.gitignore-release (100%)
 rename {.ci-files => .travis}/default.yml (100%)
 rename {.ci-files => .travis}/test.yml (100%)
 rename .travis_rsa.enc => .travis/travis_rsa.enc (100%)

diff --git a/.travis.yml b/.travis.yml
index 0c9cc611b..74886b927 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,17 +27,17 @@ services:
 
 before_script:
   - mkdir ./.config
-  - cp ./.ci-files/default.yml ./.config
-  - cp ./.ci-files/test.yml ./.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_rsa.enc -out .travis_rsa -d
-  - cp .travis_rsa ~/.ssh/id_rsa
+  - 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 .gitignore-release .gitignore
+  - 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"
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