From de5e0f418dd62d1cdc335d7d5d25c1f467a7f7a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=A3=9E=E9=BA=9F?= Date: Mon, 8 May 2017 14:47:13 +0800 Subject: [PATCH 1/9] Update README_LINUX.md --- README_LINUX.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README_LINUX.md b/README_LINUX.md index e8f170cb..c3487b94 100644 --- a/README_LINUX.md +++ b/README_LINUX.md @@ -82,8 +82,6 @@ server { #此处配置你的访问日志，请手动创建该目录： access_log /var/log/nginx/webhook.iminho.me/access.log; - root "/var/go/src/go-git-webhook"; - location ~ .*\.(ttf|woff2|eot|otf|map|swf|svg|gif|jpg|jpeg|bmp|png|ico|txt|js|css)$ { #此处将路径执行 MinDoc 的跟目录 From 4817ab2fccb56cbb4d02899d78e9d4a2b5ad3c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=A3=9E=E9=BA=9F?= Date: Mon, 8 May 2017 14:47:36 +0800 Subject: [PATCH 2/9] Update README_WIN.md --- README_WIN.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README_WIN.md b/README_WIN.md index 008cd0f2..1d2a352a 100644 --- a/README_WIN.md +++ b/README_WIN.md @@ -68,8 +68,6 @@ server { #此处配置你的访问日志，请手动创建该目录： access_log /var/log/nginx/webhook.iminho.me/access.log; - root "/var/go/src/go-git-webhook"; - location ~ .*\.(ttf|woff2|eot|otf|map|swf|svg|gif|jpg|jpeg|bmp|png|ico|txt|js|css)$ { #此处将路径执行 MinDoc 的跟目录 @@ -93,4 +91,4 @@ server { } } -``` \ No newline at end of file +``` From 2c55dbdea309ad5d59825c2aab5ee5a3e9f36a17 Mon Sep 17 00:00:00 2001 From: lifei6671 Date: Mon, 8 May 2017 17:19:02 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Travis=20CI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..23dea07a --- /dev/null +++ b/.travis.yml @@ -0,0 +1,33 @@ +language: go + +go: + - 1.8 + +before_install: + - sudo apt-get -qq update + - go get -v -u ./... + - GOARCH=amd64 GOOS=linux go build -o godoc_linux_amd64 -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'" + - GOARCH=amd64 GOOS=darwin go build -o godoc_darwin_amd64 -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'" + - GOARCH=amd64 GOOS=windows go build -o godoc_windows_amd64 -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'" + - rm -rf commands controllers models modules routers tasks vendor docs search data utils graphics .git Godeps uploads/* .gitignore .travis.yml Dockerfile gide.yaml LICENSE main.go README.md conf/enumerate.go conf/mail.go install.lock *.md + - zip -r godoc_linux_amd64.zip conf logs static uploads views godoc_linux_amd64 + - zip -r godoc_darwin_amd64.zip conf logs static uploads views godoc_darwin_amd64 + - zip -r godoc_windows_amd64.zip conf logs static uploads views godoc_windows_amd64 + +deploy: + provider: releases + api_key: $CI_USER_TOKEN + skip_cleanup: true + file: + - godoc_linux_amd64.zip + - godoc_darwin_amd64.zip + - godoc_windows_amd64.zip + on: + overwrite: true + tags: true + all_branches: true + go: 1.8 + +env: + global: + - TAG: 0.1.2 \ No newline at end of file From ee9cc514b2fc94273f77325502a5c86cd31dbb95 Mon Sep 17 00:00:00 2001 From: lifei6671 Date: Mon, 8 May 2017 17:25:31 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 23dea07a..2d6d6218 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: go go: - 1.8 -before_install: +before_deploy: - sudo apt-get -qq update - go get -v -u ./... - GOARCH=amd64 GOOS=linux go build -o godoc_linux_amd64 -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'" From 1b3dad1d9f1fd4125dcf3014b5a0414149aa10e9 Mon Sep 17 00:00:00 2001 From: lifei6671 Date: Mon, 8 May 2017 17:38:35 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d6d6218..ae266f00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,24 @@ language: go go: - 1.8 + - tip + +sudo: true + +before_install: + - go get github.com/bradfitz/gomemcache/memcache + - go get github.com/garyburd/redigo/internal + - go get github.com/garyburd/redigo/redis + - go get github.com/go-sql-driver/mysql + - go get github.com/golang/freetype + +script: + - go get -t -v ./... + - go test -v -race ./... + - go build -v -tags "pam" && go install before_deploy: - sudo apt-get -qq update - - go get -v -u ./... - GOARCH=amd64 GOOS=linux go build -o godoc_linux_amd64 -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'" - GOARCH=amd64 GOOS=darwin go build -o godoc_darwin_amd64 -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'" - GOARCH=amd64 GOOS=windows go build -o godoc_windows_amd64 -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'" From 8bdbb5f94830c566cf94fba7cb133a92dc9d3781 Mon Sep 17 00:00:00 2001 From: lifei6671 Date: Mon, 8 May 2017 17:45:33 +0800 Subject: [PATCH 6/9] * --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ae266f00..02bd9e2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ before_install: script: - go get -t -v ./... - - go test -v -race ./... - go build -v -tags "pam" && go install before_deploy: From 8ee4d4997525bd99eb1ec8e254fd5f8abd7d4406 Mon Sep 17 00:00:00 2001 From: lifei6671 Date: Mon, 8 May 2017 17:50:44 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BD=BF=E7=94=A8Travis=20CI=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 1 - README.md | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 02bd9e2c..051f0613 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: go go: - 1.8 - - tip sudo: true diff --git a/README.md b/README.md index ffde8109..0e6d6399 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # MinDoc 简介 +[![Build Status](https://travis-ci.org/lifei6671/godoc.svg?branch=master)](https://travis-ci.org/lifei6671/godoc) + MinDoc 是一款针对IT团队开发的简单好用的文档管理系统。 MinDoc 的前身是 SmartWiki 文档系统。SmartWiki 是基于 PHP 框架 laravel 开发的一款文档管理系统。因 PHP 的部署对普通用户来说太复杂，所以改用 Golang 开发。可以方便用户部署和实用。 From 33a8b3bb3d846c703a3cddd314cb8ce4902de7ce Mon Sep 17 00:00:00 2001 From: lifei6671 Date: Mon, 8 May 2017 18:01:14 +0800 Subject: [PATCH 8/9] * --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 051f0613..f5aac0e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_deploy: - sudo apt-get -qq update - GOARCH=amd64 GOOS=linux go build -o godoc_linux_amd64 -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'" - GOARCH=amd64 GOOS=darwin go build -o godoc_darwin_amd64 -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'" - - GOARCH=amd64 GOOS=windows go build -o godoc_windows_amd64 -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'" + - GOARCH=amd64 GOOS=windows go build -o godoc_windows_amd64.exe -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'" - rm -rf commands controllers models modules routers tasks vendor docs search data utils graphics .git Godeps uploads/* .gitignore .travis.yml Dockerfile gide.yaml LICENSE main.go README.md conf/enumerate.go conf/mail.go install.lock *.md - zip -r godoc_linux_amd64.zip conf logs static uploads views godoc_linux_amd64 - zip -r godoc_darwin_amd64.zip conf logs static uploads views godoc_darwin_amd64 @@ -42,4 +42,4 @@ deploy: env: global: - - TAG: 0.1.2 \ No newline at end of file + - TAG: 0.1.3 \ No newline at end of file From e88e60622de7a09ae50992bb02fa9340116a40ce Mon Sep 17 00:00:00 2001 From: lifei6671 Date: Mon, 8 May 2017 18:07:41 +0800 Subject: [PATCH 9/9] * --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f5aac0e8..27030ab5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ before_deploy: - rm -rf commands controllers models modules routers tasks vendor docs search data utils graphics .git Godeps uploads/* .gitignore .travis.yml Dockerfile gide.yaml LICENSE main.go README.md conf/enumerate.go conf/mail.go install.lock *.md - zip -r godoc_linux_amd64.zip conf logs static uploads views godoc_linux_amd64 - zip -r godoc_darwin_amd64.zip conf logs static uploads views godoc_darwin_amd64 - - zip -r godoc_windows_amd64.zip conf logs static uploads views godoc_windows_amd64 + - zip -r godoc_windows_amd64.zip conf logs static uploads views godoc_windows_amd64.exe deploy: provider: releases