From c4c6af6d5a10288ae94d5a12d3996ca58546d14c Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Thu, 30 Jul 2015 22:26:41 +0200 Subject: [PATCH 01/12] initial travis integration (valid upstream) --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..7b3e6dd --- /dev/null +++ b/.travis.yml @@ -0,0 +1,11 @@ +language: go +go: + - 1.1 + - 1.2 + - 1.3 + - release + - tip + +script: + - go test -v ./... + From a38be8258b2d7637953477557d0db4b8a0767fe6 Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Thu, 30 Jul 2015 22:30:57 +0200 Subject: [PATCH 02/12] reduce test verbosity --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7b3e6dd..7a22379 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,5 @@ go: - tip script: - - go test -v ./... + - go test ./... From ca6706da01d799fa07fedb2da05dbbf2f44232e8 Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Thu, 30 Jul 2015 22:35:49 +0200 Subject: [PATCH 03/12] check build break --- ufs/ufs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ufs/ufs.go b/ufs/ufs.go index 3a561a1..ee732c5 100644 --- a/ufs/ufs.go +++ b/ufs/ufs.go @@ -16,7 +16,7 @@ var debug = flag.Int("debug", 0, "print debug messages") var root = flag.String("root", "/", "root filesystem") func main() { - flag.Parse() + lag.Parse() ufs := new(go9p.Ufs) ufs.Dotu = true ufs.Id = "ufs" From f5cbea83dda5e86f32f691ce423363f7a28d51b5 Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Thu, 30 Jul 2015 22:38:51 +0200 Subject: [PATCH 04/12] check build fix --- ufs/ufs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ufs/ufs.go b/ufs/ufs.go index ee732c5..3a561a1 100644 --- a/ufs/ufs.go +++ b/ufs/ufs.go @@ -16,7 +16,7 @@ var debug = flag.Int("debug", 0, "print debug messages") var root = flag.String("root", "/", "root filesystem") func main() { - lag.Parse() + flag.Parse() ufs := new(go9p.Ufs) ufs.Dotu = true ufs.Id = "ufs" From bad583eece84aee43912e16bf4967da3336f986d Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Fri, 31 Jul 2015 01:35:47 +0200 Subject: [PATCH 05/12] .travis.yml before_script to avoid go get of upstream --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7a22379..42fb3f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,8 @@ go: - 1.3 - release - tip - +before_install: + - mkdir ../../rminnich && ln -s `pwd` ../../rminnich/go9p script: - go test ./... From 37fe7ea89c6b1957f15e4523a85e853a69bd63f9 Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Fri, 31 Jul 2015 15:12:29 +0100 Subject: [PATCH 06/12] alternative set of hacks, easy to fork --- .ci-scripts/README.md | 9 +++++++++ .ci-scripts/after_failure.sh | 1 + .ci-scripts/after_script.sh | 1 + .ci-scripts/after_success.sh | 1 + .ci-scripts/before_install.sh | 1 + .ci-scripts/before_script.sh | 1 + .ci-scripts/install.sh | 1 + .ci-scripts/script.sh | 1 + .travis.yml | 15 ++++++++++++--- 9 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 .ci-scripts/README.md create mode 100755 .ci-scripts/after_failure.sh create mode 100755 .ci-scripts/after_script.sh create mode 100755 .ci-scripts/after_success.sh create mode 100755 .ci-scripts/before_install.sh create mode 100755 .ci-scripts/before_script.sh create mode 100755 .ci-scripts/install.sh create mode 100755 .ci-scripts/script.sh diff --git a/.ci-scripts/README.md b/.ci-scripts/README.md new file mode 100644 index 0000000..243cd84 --- /dev/null +++ b/.ci-scripts/README.md @@ -0,0 +1,9 @@ +Scripts for Continuous Integration +================================== + +The scripts in this folder are designed to be integrated in Travis-CI. + +They map the main hooks provided by Travis-CI, so that forkers can customize their processes. + +For example, Golang forks of `go get`able repos can use before_install.sh to avoid `go get` of upstream imports. + diff --git a/.ci-scripts/after_failure.sh b/.ci-scripts/after_failure.sh new file mode 100755 index 0000000..b23e556 --- /dev/null +++ b/.ci-scripts/after_failure.sh @@ -0,0 +1 @@ +#!/bin/true diff --git a/.ci-scripts/after_script.sh b/.ci-scripts/after_script.sh new file mode 100755 index 0000000..b23e556 --- /dev/null +++ b/.ci-scripts/after_script.sh @@ -0,0 +1 @@ +#!/bin/true diff --git a/.ci-scripts/after_success.sh b/.ci-scripts/after_success.sh new file mode 100755 index 0000000..b23e556 --- /dev/null +++ b/.ci-scripts/after_success.sh @@ -0,0 +1 @@ +#!/bin/true diff --git a/.ci-scripts/before_install.sh b/.ci-scripts/before_install.sh new file mode 100755 index 0000000..b23e556 --- /dev/null +++ b/.ci-scripts/before_install.sh @@ -0,0 +1 @@ +#!/bin/true diff --git a/.ci-scripts/before_script.sh b/.ci-scripts/before_script.sh new file mode 100755 index 0000000..b23e556 --- /dev/null +++ b/.ci-scripts/before_script.sh @@ -0,0 +1 @@ +#!/bin/true diff --git a/.ci-scripts/install.sh b/.ci-scripts/install.sh new file mode 100755 index 0000000..b23e556 --- /dev/null +++ b/.ci-scripts/install.sh @@ -0,0 +1 @@ +#!/bin/true diff --git a/.ci-scripts/script.sh b/.ci-scripts/script.sh new file mode 100755 index 0000000..b23e556 --- /dev/null +++ b/.ci-scripts/script.sh @@ -0,0 +1 @@ +#!/bin/true diff --git a/.travis.yml b/.travis.yml index 42fb3f9..1d2fefa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,16 @@ go: - release - tip before_install: - - mkdir ../../rminnich && ln -s `pwd` ../../rminnich/go9p + - .ci-scripts/before_install.sh +install: + - .ci-scripts/install.sh +before_script: + - .ci-scripts/before_script.sh script: - - go test ./... - + - .ci-scripts/script.sh +after_success: + - .ci-scripts/after_succeess.sh +after_failure: + - .ci-scripts/after_failure.sh +after_script: + - .ci-scripts/after_script.sh From 5f5c07d313d5538ed66505641ee098c296198928 Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Fri, 31 Jul 2015 16:35:25 +0100 Subject: [PATCH 07/12] actually build again --- .ci-scripts/README.md | 4 +++- .ci-scripts/before_install.sh | 18 +++++++++++++++++- .ci-scripts/install.sh | 6 +++++- .ci-scripts/script.sh | 6 +++++- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/.ci-scripts/README.md b/.ci-scripts/README.md index 243cd84..8d3b68b 100644 --- a/.ci-scripts/README.md +++ b/.ci-scripts/README.md @@ -5,5 +5,7 @@ The scripts in this folder are designed to be integrated in Travis-CI. They map the main hooks provided by Travis-CI, so that forkers can customize their processes. -For example, Golang forks of `go get`able repos can use before_install.sh to avoid `go get` of upstream imports. +For example, Golang forks of `go get`able repos can use before_install.sh to avoid `go get` of +upstream imports, using an environment variable UPSTREAM_OWNER containing the Github name of +the owner of the upstream repo. diff --git a/.ci-scripts/before_install.sh b/.ci-scripts/before_install.sh index b23e556..9533d4d 100755 --- a/.ci-scripts/before_install.sh +++ b/.ci-scripts/before_install.sh @@ -1 +1,17 @@ -#!/bin/true +#!/bin/bash + +set -x + +if [ "$TRAVIS_GO_VERSION" = "tip" ]; then + go get github.com/axw/gocov/gocov + go get github.com/mattn/goveralls + if ! go get code.google.com/p/go.tools/cmd/cover; then + go get golang.org/x/tools/cmd/cover; + fi +fi + +if [ "$UPSTREAM_OWNER" != "" ]; then + REPO_NAME=`basename $TRAVIS_REPO_SLUG` + mkdir ../../$UPSTREAM_OWNER && ln -s `pwd` ../../$UPSTREAM_OWNER/$REPO_NAME +fi + diff --git a/.ci-scripts/install.sh b/.ci-scripts/install.sh index b23e556..a9778f9 100755 --- a/.ci-scripts/install.sh +++ b/.ci-scripts/install.sh @@ -1 +1,5 @@ -#!/bin/true +#!/bin/bash + +set -x + +go get -v .\... diff --git a/.ci-scripts/script.sh b/.ci-scripts/script.sh index b23e556..3e6bdd3 100755 --- a/.ci-scripts/script.sh +++ b/.ci-scripts/script.sh @@ -1 +1,5 @@ -#!/bin/true +#!/bin/bash + +set -x + +go test ./... From 85dc8fb32792468960cb6c8d9570c47dd55072b6 Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Fri, 31 Jul 2015 16:42:31 +0100 Subject: [PATCH 08/12] .ci-scripts/install.sh: typo --- .ci-scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci-scripts/install.sh b/.ci-scripts/install.sh index a9778f9..e7213c9 100755 --- a/.ci-scripts/install.sh +++ b/.ci-scripts/install.sh @@ -2,4 +2,4 @@ set -x -go get -v .\... +go get -v ./... From 4f0154001697797fd6f8906fdd3269eb6e50de9e Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Fri, 31 Jul 2015 16:51:28 +0100 Subject: [PATCH 09/12] activate coverall.io --- .ci-scripts/script.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.ci-scripts/script.sh b/.ci-scripts/script.sh index 3e6bdd3..99214b4 100755 --- a/.ci-scripts/script.sh +++ b/.ci-scripts/script.sh @@ -2,4 +2,8 @@ set -x -go test ./... +if [ "" = "tip" ]; then + goveralls -service=travis-ci; +else + go test ./...; +fi From e798e1900903559d085df83005709453bf6eafcf Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Fri, 31 Jul 2015 16:56:33 +0100 Subject: [PATCH 10/12] .ci-scripts/script.sh: fix go version check --- .ci-scripts/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci-scripts/script.sh b/.ci-scripts/script.sh index 99214b4..dba699a 100755 --- a/.ci-scripts/script.sh +++ b/.ci-scripts/script.sh @@ -2,7 +2,7 @@ set -x -if [ "" = "tip" ]; then +if [ "$TRAVIS_GO_VERSION" = "tip" ]; then goveralls -service=travis-ci; else go test ./...; From 2653280e76daa5eadb839cf4c42460d778ad2d4b Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Fri, 31 Jul 2015 17:21:27 +0100 Subject: [PATCH 11/12] README.md: add badges for travis-ci and coverall.io --- README.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2a6731b..eb17471 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,16 @@ +[![Build Status](https://travis-ci.org/Shamar/go9p.svg?branch=)](https://travis-ci.org/Shamar/go9p) +[![Coverage Status](https://coveralls.io/repos/Shamar/go9p/badge.svg?branch=master&service=github)](https://coveralls.io/github/Shamar/go9p) + This is go9p done in a way that I can understand. To install: - export GOPATH=~rminnich/go - go get -a github.com/rminnich/go9p - go get -a github.com/rminnich/go9p/ufs - go install -a github.com/rminnich/go9p/ufs -~/go/bin/ufs + export GOPATH=~/go + go get -a github.com/rminnich/go9p + go get -a github.com/rminnich/go9p/ufs + go install -a github.com/rminnich/go9p/ufs + +Then to start serving the root fs via 9p at port 5640: + ~/go/bin/ufs From f7159333984f5e42c4102b140fbded817e2c40b1 Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Fri, 31 Jul 2015 17:34:45 +0100 Subject: [PATCH 12/12] README.md: badges point to rminnich repo [skip-ci] --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eb17471..8687dc6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![Build Status](https://travis-ci.org/Shamar/go9p.svg?branch=)](https://travis-ci.org/Shamar/go9p) -[![Coverage Status](https://coveralls.io/repos/Shamar/go9p/badge.svg?branch=master&service=github)](https://coveralls.io/github/Shamar/go9p) +[![Build Status](https://travis-ci.org/rminnich/go9p.svg?branch=master)](https://travis-ci.org/rminnich/go9p) +[![Coverage Status](https://coveralls.io/repos/rminnich/go9p/badge.svg?branch=master&service=github)](https://coveralls.io/github/rminnich/go9p) This is go9p done in a way that I can understand.