diff --git a/.travis.yml b/.travis.yml index 0646b242..d237e1dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,11 @@ before_install: - go get github.com/garyburd/redigo/redis - go get github.com/go-sql-driver/mysql - go get github.com/golang/freetype + - go get github.com/russross/blackfriday script: - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh - - dep ensure + - dep ensure -v - GO_ENABLED=1 go build -v -x -tags "pam" && go install before_deploy: diff --git a/appveyor.yml b/appveyor.yml index 72d25a0c..fe1c3563 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,7 +27,7 @@ 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; } - - set PATH=%GOBIN%;%PATH% + - set PATH=%GOPATH%\bin;c:\go\bin;%PATH% - echo %PATH% - echo %GOPATH% - go version @@ -37,7 +37,9 @@ 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 - - go get -u github.com/golang/dep/cmd/dep + - go get -u github.com/golang/dep/cmd/dep && cd %GOPATH%/src/github.com/golang/dep + - for /f "delims=" %%i in ('git describe --abbrev=0 --tags') do (set DEP_LATEST=%%i) + - go install -ldflags="-X main.version=%DEP_LATEST%" ./cmd/dep - dep ensure -v - 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%'"