From efbbc55d529aa3a7e8a9281a53b2adbf62fb51df Mon Sep 17 00:00:00 2001 From: haya14busa Date: Wed, 14 Dec 2016 00:29:55 +0900 Subject: [PATCH 1/2] vendoring with git submodule - helper vendoring tool: https://github.com/kovetskiy/manul "git submodule" vendoring assumes the all depending repositories exist. --- .gitmodules | 24 ++++++++++++++++++++++++ vendor/github.com/google/go-github | 1 + vendor/github.com/google/go-querystring | 1 + vendor/github.com/haya14busa/errorformat | 1 + vendor/github.com/mattn/go-shellwords | 1 + vendor/golang.org/x/net | 1 + vendor/golang.org/x/oauth2 | 1 + vendor/golang.org/x/sync | 1 + vendor/gopkg.in/yaml.v2 | 1 + 9 files changed, 32 insertions(+) create mode 100644 .gitmodules create mode 160000 vendor/github.com/google/go-github create mode 160000 vendor/github.com/google/go-querystring create mode 160000 vendor/github.com/haya14busa/errorformat create mode 160000 vendor/github.com/mattn/go-shellwords create mode 160000 vendor/golang.org/x/net create mode 160000 vendor/golang.org/x/oauth2 create mode 160000 vendor/golang.org/x/sync create mode 160000 vendor/gopkg.in/yaml.v2 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..cb9476973c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,24 @@ +[submodule "vendor/github.com/google/go-github"] + path = vendor/github.com/google/go-github + url = https://github.com/google/go-github +[submodule "vendor/github.com/google/go-querystring"] + path = vendor/github.com/google/go-querystring + url = https://github.com/google/go-querystring +[submodule "vendor/github.com/haya14busa/errorformat"] + path = vendor/github.com/haya14busa/errorformat + url = https://github.com/haya14busa/errorformat +[submodule "vendor/github.com/mattn/go-shellwords"] + path = vendor/github.com/mattn/go-shellwords + url = https://github.com/mattn/go-shellwords +[submodule "vendor/golang.org/x/net"] + path = vendor/golang.org/x/net + url = https://go.googlesource.com/net +[submodule "vendor/golang.org/x/oauth2"] + path = vendor/golang.org/x/oauth2 + url = https://go.googlesource.com/oauth2 +[submodule "vendor/golang.org/x/sync"] + path = vendor/golang.org/x/sync + url = https://go.googlesource.com/sync +[submodule "vendor/gopkg.in/yaml.v2"] + path = vendor/gopkg.in/yaml.v2 + url = https://gopkg.in/yaml.v2 diff --git a/vendor/github.com/google/go-github b/vendor/github.com/google/go-github new file mode 160000 index 0000000000..939928b912 --- /dev/null +++ b/vendor/github.com/google/go-github @@ -0,0 +1 @@ +Subproject commit 939928b912496ed4fbeb6e4beb2467b4fa540af7 diff --git a/vendor/github.com/google/go-querystring b/vendor/github.com/google/go-querystring new file mode 160000 index 0000000000..9235644dd9 --- /dev/null +++ b/vendor/github.com/google/go-querystring @@ -0,0 +1 @@ +Subproject commit 9235644dd9e52eeae6fa48efd539fdc351a0af53 diff --git a/vendor/github.com/haya14busa/errorformat b/vendor/github.com/haya14busa/errorformat new file mode 160000 index 0000000000..650dea9d7c --- /dev/null +++ b/vendor/github.com/haya14busa/errorformat @@ -0,0 +1 @@ +Subproject commit 650dea9d7c0fb56c7abf37e2e37fa45b1ad3d56c diff --git a/vendor/github.com/mattn/go-shellwords b/vendor/github.com/mattn/go-shellwords new file mode 160000 index 0000000000..525bedee69 --- /dev/null +++ b/vendor/github.com/mattn/go-shellwords @@ -0,0 +1 @@ +Subproject commit 525bedee691b5a8df547cb5cf9f86b7fb1883e24 diff --git a/vendor/golang.org/x/net b/vendor/golang.org/x/net new file mode 160000 index 0000000000..cfae461ced --- /dev/null +++ b/vendor/golang.org/x/net @@ -0,0 +1 @@ +Subproject commit cfae461cedfdcab6e261a26eb77db53695623303 diff --git a/vendor/golang.org/x/oauth2 b/vendor/golang.org/x/oauth2 new file mode 160000 index 0000000000..96382aa079 --- /dev/null +++ b/vendor/golang.org/x/oauth2 @@ -0,0 +1 @@ +Subproject commit 96382aa079b72d8c014eb0c50f6c223d1e6a2de0 diff --git a/vendor/golang.org/x/sync b/vendor/golang.org/x/sync new file mode 160000 index 0000000000..450f422ab2 --- /dev/null +++ b/vendor/golang.org/x/sync @@ -0,0 +1 @@ +Subproject commit 450f422ab23cf9881c94e2db30cac0eb1b7cf80c diff --git a/vendor/gopkg.in/yaml.v2 b/vendor/gopkg.in/yaml.v2 new file mode 160000 index 0000000000..a5b47d31c5 --- /dev/null +++ b/vendor/gopkg.in/yaml.v2 @@ -0,0 +1 @@ +Subproject commit a5b47d31c556af34a302ce5d659e6fea44d90de0 From fac468c707604d88ba0099daa77329ad45eeaaa4 Mon Sep 17 00:00:00 2001 From: haya14busa Date: Fri, 16 Dec 2016 20:09:53 +0900 Subject: [PATCH 2/2] CI: handle vendor --- .drone.sec | 2 +- .drone.yml | 8 +++++--- .travis.yml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.drone.sec b/.drone.sec index baa832d850..04fc8ab37d 100644 --- a/.drone.sec +++ b/.drone.sec @@ -1 +1 @@ -eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.eEuGoCuYdUYiXtxDg_jTs-biduAlDV8YH5qVQD-B6h-4JBqqR_8Er6hOiI3GpSyLYGg72qM_jdjVaaWAq0Yzrs2QHc_3qMdBzWoi78uyCuaEM6qrZakIBjHvjfDcgfQ6sDHfDMLHXWJQmZR_bOR9cA628JtwmLKWBir36GROXAmY0ciOFcvqcPUwMLkgE4TltOtQs63vGhIDdUOajUwl1l5iEfCgPik3GEm504N88de22AFKaazUrHKGwnMpOypgfUMhMGiEM6Tb_i8-gH-MWyTare8M-H19M9g1LkbLTP7IH1BMl736m2lkQpVKaJXC7BmSOVvoni7PqvwSxMNeRQ.hskL4_H0Uq-6jvz4.un-1RgP6sDdwjP_W9l7NJ7YYdtXzPxVxO8dksqBDDkc6p4v2A0bUGwWMDcvgiP0fjttcZ_xyMSSx7Q3IB7c83pvKBi4yrxyVifPPIWVsLZKwg436pvyiIOUR1U7vkVmmmA33yKddqrMLEnRpvBNWH18fPkYWwdHAlzw4VBv1k5P73iUmBn_i_N_gHZZRrQWAa2HR0AFVz9LiHV0N9q-O.WsvCmoV14OqQMH7P2PVTRg \ No newline at end of file +eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.YxFrc7LjY-zbh9oj7ljxt1DTC_mE35kcdEjDWwHyf6GkknRqedJ_UxDEXfn-b69Fm9-4KhP-s5Z0LRMcZ6LyaJc8USSE8tU_4i4FlMPXosov_swKium_i_kXWdSCEU8AzToOZjorXb3u5YkZpbGwNU3sNWTvsFHxBIxM6qiSL80NQX2rsXF2BsACubPtwr7tla1APbrVs7yQu8kqDi6kc_bwR1syaym0saF567eKNW81Sg_DzFYmsWP0eaFCE3YnUJLlIC7r5raPDMq_Rxek0G9_U7AZlOxJ2JiBsddjo2yRQvHS8c67dqeE6pgggmmwsllWmpRD054rKtEYWxJi3A.bpFd9nJPYV1ri8Yf.DtGardgx3TnofWVwJDZXjRDlr19owKxERuAUC0fBYmpCBa1OGNTBRaoT2VHt6YjgeUMPk1M4x_X86vTj2h3BdEv9dT_2mjo8XTle9-UuYHXOGUeT_lwDidOxUe_4ykD-6p0E2DOTHXo9Wv27mNZ2bxr9AEBwXD31XQZenl4Lp0KUeKMNcKREA_DpqjHNLmq17zWsucC_UMImYOkwB9si.uC8-yialTPshLjNHttV64A \ No newline at end of file diff --git a/.drone.yml b/.drone.yml index 346aeb6dc1..8339ed7f9e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,9 +5,11 @@ build: test: image: golang commands: - - go get -d -v -t ./... - - go test -v ./... - - (! gofmt -s -d . | grep '^') # exit 1 if any output given + - git submodule update --init --recursive + - go build -v $(go list ./... | grep -v "/vendor/") + - go get -d -v -t $(go list ./... | grep -v "/vendor/") + - go test -v -race $(go list ./... | grep -v "/vendor/") + - (! gofmt -s -d *.go cmd diff project | grep '^') lint: image: golang environment: diff --git a/.travis.yml b/.travis.yml index 171bd746d0..10a4582772 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ before_script: - echo $TRAVIS_SECURE_ENV_VARS script: - - go test -v -race ./... + - go test -v -race $(go list ./... | grep -v "/vendor/") - goverage -coverprofile=coverage.txt ./... - go install ./cmd/reviewdog - >-