From 6c86825732c713c46b2c3e37124d044d988ab951 Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Fri, 12 Apr 2019 23:33:36 +0900
Subject: [PATCH 1/4] update travis

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0e949973..08492036 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,4 +25,7 @@ deploy:
     - TheDesk-darwin-x64.zip
   skip_cleanup: true
   on:
-    repo: cutls/TheDesk
\ No newline at end of file
+    repo: cutls/TheDesk
+branches:
+  only:
+  - master
\ No newline at end of file

From 426e48325c6f4d50e0f3fe1e0f7d21480a544970 Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Fri, 12 Apr 2019 23:35:22 +0900
Subject: [PATCH 2/4] osx

---
 .travis.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 08492036..8db7d99b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,19 @@
-os: windows
+os: osx
 language: node_js
 node_js:
 - '10.15.2'
 script: node -v
+before_install:
+  # nvm をインストールする。Travis の OS X 環境には nvm はデフォルトで入っていない
+  - git clone https://github.com/creationix/nvm.git /tmp/.nvm
+  - source /tmp/.nvm/nvm.sh
+  # 指定バージョンの Node をインストールする
+  - nvm install $NODE_VERSION
+  # 指定バージョンの Node を有効にする
+  - nvm use --delete-prefix $NODE_VERSION
+  - node --version
+script:
+  - node --version
 before_deploy:
   - brew update
   - npm install electron-builder -g
@@ -11,8 +22,6 @@ before_deploy:
   - electron-builder --mac --x64
   - mv ../build/TheDesk*.dmg ../TheDesk.dmg
   - mv ../build/TheDesk*.zip ../TheDesk-darwin-x64.zip
-  - ls ../build/
-  - ls ../
   - cd ../
 deploy:
   provider: releases
@@ -22,10 +31,6 @@ deploy:
   # Releases ページにアップロードするファイル
   file:
     - TheDesk.dmg
-    - TheDesk-darwin-x64.zip
   skip_cleanup: true
   on:
-    repo: cutls/TheDesk
-branches:
-  only:
-  - master
\ No newline at end of file
+    repo: cutls/TheDesk
\ No newline at end of file

From 0c1191e36228f52b94ea692eed2c94b4b4fdef1b Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Fri, 12 Apr 2019 23:35:48 +0900
Subject: [PATCH 3/4] travis

---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8db7d99b..e923fced 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,10 @@ deploy:
   # Releases ページにアップロードするファイル
   file:
     - TheDesk.dmg
+    - TheDesk-darwin-x64.zip
   skip_cleanup: true
   on:
-    repo: cutls/TheDesk
\ No newline at end of file
+    repo: cutls/TheDesk
+branches:
+  only:
+  - master
\ No newline at end of file

From 972ea9f5ed17a14d2e89d6e864ed0a2e1c72c4ba Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Fri, 12 Apr 2019 23:36:16 +0900
Subject: [PATCH 4/4] travjs

---
 .travis.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e923fced..932cb03c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,18 +2,6 @@ os: osx
 language: node_js
 node_js:
 - '10.15.2'
-script: node -v
-before_install:
-  # nvm をインストールする。Travis の OS X 環境には nvm はデフォルトで入っていない
-  - git clone https://github.com/creationix/nvm.git /tmp/.nvm
-  - source /tmp/.nvm/nvm.sh
-  # 指定バージョンの Node をインストールする
-  - nvm install $NODE_VERSION
-  # 指定バージョンの Node を有効にする
-  - nvm use --delete-prefix $NODE_VERSION
-  - node --version
-script:
-  - node --version
 before_deploy:
   - brew update
   - npm install electron-builder -g