From 54a4de91a7fdcb7b68769e5d4231bb138638b888 Mon Sep 17 00:00:00 2001
From: FairyEver <1711467488@qq.com>
Date: Mon, 25 Nov 2019 23:45:16 +0800
Subject: [PATCH] add deploy folder

Former-commit-id: 63166d41786adf5f106be68a25fa0806031f653c
Former-commit-id: 68429e65dde743b4b3bb538e720adf3c10a29182
Former-commit-id: e44b22d97cb60806dddd05fc6bd3313c9eeefddc
Former-commit-id: 97f4158a538fec2ba207da2e76711f287cb6471d [formerly 6929fd90d71c3271d3063776d19ebc395b264392]
Former-commit-id: 1870931841bc9df676505c235a7463c8846c4459
Former-commit-id: 84171b5d0a5c7145b4b1e1e010d4c7af44efdf24
Former-commit-id: 1add4eef08b3e2350f7c207a19b06c938a1301c9
Former-commit-id: 91340971bd5bf3edcc6da13dc0d2bd97587250d6
Former-commit-id: 3a068c0b834c30b7b8785f5ecd65fa9bf902ae1c
---
 .travis.yml                                   |  6 +++---
 cdnrefresh-dirs.txt => deploy/cdnrefresh.txt  |  0
 .../qshell.REMOVED.git-id                     |  0
 deploy/upload.conf                            | 11 +++++++++++
 qiniu-config                                  | 19 -------------------
 5 files changed, 14 insertions(+), 22 deletions(-)
 rename cdnrefresh-dirs.txt => deploy/cdnrefresh.txt (100%)
 rename qshell.REMOVED.git-id => deploy/qshell.REMOVED.git-id (100%)
 create mode 100644 deploy/upload.conf
 delete mode 100644 qiniu-config

diff --git a/.travis.yml b/.travis.yml
index 46d3d84c..41bb3583 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,6 @@ before_install:
   - export PATH=$HOME/.yarn/bin:$PATH
 
 after_success:
-  - ./qshell account $AK $SK liyang
-  - ./qshell qupload qiniu-config
-  - ./qshell cdnrefresh --dirs -i cdnrefresh-dirs.txt
\ No newline at end of file
+  - ./deploy/qshell account $AK $SK liyang
+  - ./deploy/qshell qupload ./deploy/upload.conf
+  - ./deploy/qshell cdnrefresh --dirs -i ./deploy/cdnrefresh.txt
\ No newline at end of file
diff --git a/cdnrefresh-dirs.txt b/deploy/cdnrefresh.txt
similarity index 100%
rename from cdnrefresh-dirs.txt
rename to deploy/cdnrefresh.txt
diff --git a/qshell.REMOVED.git-id b/deploy/qshell.REMOVED.git-id
similarity index 100%
rename from qshell.REMOVED.git-id
rename to deploy/qshell.REMOVED.git-id
diff --git a/deploy/upload.conf b/deploy/upload.conf
new file mode 100644
index 00000000..a3d25c0a
--- /dev/null
+++ b/deploy/upload.conf
@@ -0,0 +1,11 @@
+{
+  "src_dir"            :   "/home/travis/build/d2-projects/d2-admin/dist",
+  "bucket"             :   "fairyever-site",
+  "key_prefix"         :   "d2-admin/preview/",
+  "ignore_dir"         :   false,
+  "overwrite"          :   true,
+  "check_exists"       :   true,
+  "check_hash"         :   true,
+  "check_size"         :   true,
+  "rescan_local"       :   true
+}
\ No newline at end of file
diff --git a/qiniu-config b/qiniu-config
deleted file mode 100644
index 54da4289..00000000
--- a/qiniu-config
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "src_dir"            :   "/home/travis/build/d2-projects/d2-admin/dist",
-  "bucket"             :   "fairyever-site",
-  "key_prefix"         :   "d2-admin/preview/",
-  "ignore_dir"         :   false,
-  "overwrite"          :   true,
-  "check_exists"       :   true,
-  "check_hash"         :   true,
-  "check_size"         :   true,
-  "rescan_local"       :   true,
-  "skip_file_prefixes" :   "test,demo,",
-  "skip_path_prefixes" :   "hello/,temp/",
-  "skip_fixed_strings" :   ".svn,.git",
-  "skip_suffixes"      :   ".DS_Store,.exe",
-  "log_file"           :   "upload.log",
-  "log_level"          :   "info",
-  "log_rotate"         :   1,
-  "log_stdout"         :   false
-}
\ No newline at end of file