From cf5f3323ce16f7152adffdde014e4e5cc01f1ffb Mon Sep 17 00:00:00 2001
From: Minho <longfei6671@163.com>
Date: Tue, 6 Mar 2018 13:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=8C=85=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=B9=B6=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml  | 4 ++--
 appveyor.yml | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8804c28c..a8fe41be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,8 @@ before_install:
   - go get github.com/golang/freetype
 
 script:
-  - curl https://glide.sh/get | sh
-  - glide update
+  - go get -u github.com/golang/dep/cmd/dep
+  - dep ensure
   - GO_ENABLED=1 go build -v -x -tags "pam" && go install
 
 before_deploy:
diff --git a/appveyor.yml b/appveyor.yml
index 7d61c840..d85a5384 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -27,9 +27,6 @@ install:
             Start-FileDownload "http://libgd.blob.core.windows.net/mingw/i686-4.9.1-release-posix-dwarf-rt_v3-rev1.7z" -FileName mingw_x86.7z;
             7z x -oC:\ mingw_x86.7z | out-null;
         }
-  - ps:  Start-FileDownload  https://github.com/Masterminds/glide/releases/download/v0.12.3/glide-v0.12.3-windows-amd64.zip;
-         7z x -oC:\ glide-v0.12.3-windows-amd64.zip | out-null;
-         copy C:\windows-amd64\glide.exe c:\go\bin\ ;
   - set PATH=%GOBIN%;%PATH%
   - echo %PATH%
   - echo %GOPATH%
@@ -40,7 +37,8 @@ build_script:
   - if [%tbs_tools%]==[mingw] if [%tbs_arch%]==[x86] SET PATH=C:\mingw32\bin;%PATH%
   - if [%tbs_tools%]==[mingw] if [%tbs_arch%]==[x64] SET PATH=C:\mingw64\bin;%PATH%
   - set CGO_ENABLED=1
-  - glide update
+  - go get -u github.com/golang/dep/cmd/dep
+  - dep ensure
   - for /f "delims=" %%i in ('go version') do (set GO_VERSION=%%i)
   - go build -v -o "mindoc_windows_%GOARCH%.exe" -ldflags="-w -X github.com/lifei6671/mindoc/conf.VERSION=%APPVEYOR_REPO_TAG_NAME% -X 'github.com/lifei6671/mindoc/conf.BUILD_TIME=%date% %time%' -X 'conf.GO_VERSION=%GO_VERSION%'"
   - 7z a -t7z -r mindoc_windows_%GOARCH%.7z conf/*.conf* static/* mindoc_windows_%GOARCH%.exe views/* uploads/*