From 98839d1c5300f615d301af637bc1bd95a823e69a Mon Sep 17 00:00:00 2001 From: David Justice Date: Wed, 17 Oct 2018 15:13:19 -0700 Subject: [PATCH] remove install.sh and add travis go mod env and mod tidy --- .gitignore | 3 ++- .travis.yml | 5 ++++- README.md | 6 ++++-- go.sum | 1 - install.sh | 23 ----------------------- sdk/go.mod | 3 +-- sdk/go.sum | 2 -- 7 files changed, 11 insertions(+), 32 deletions(-) delete mode 100644 install.sh diff --git a/.gitignore b/.gitignore index 9d18b11..284e1d0 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ vendor/ -.idea/ \ No newline at end of file +.idea/ + diff --git a/.travis.yml b/.travis.yml index 6329309..0e910ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,11 @@ install: script: - go generate ./... - test -z "$(git diff ./generators/eventgrid/static_templates.go | tee /dev/stderr)" - - go build ./... + - go build all - go test -race ./... - test -z "$(go fmt ./... | tee /dev/stderr)" - test -z "$(golint $(go list ./...) | tee /dev/stderr)" - go vet ./... + +env: + - GO111MODULE=on diff --git a/README.md b/README.md index 00d926a..82a6b56 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,10 @@ This is an extension, so before you install Buffalo-Azure, make sure you've alre ##### go get -The way to get started is to use `go get`. This project support Go modules when using Go 1.11 and above. -For more information see [Go modules wiki](https://github.com/golang/go/wiki/Modules). +Use `go get` to acquire and install from source. Versions of the project after `v0.2.0` use +Go modules exclusively, which means you'll need Go 1.11 or later. + +For more information on modules, see the [Go modules wiki](https://github.com/golang/go/wiki/Modules). ``` bash go get -u github.com/Azure/buffalo-azure diff --git a/go.sum b/go.sum index b89c500..86941e9 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,5 @@ github.com/Azure/azure-sdk-for-go v18.0.0+incompatible h1:PD98+de2PG0lTTSKFJRkMO1ieGfjEuSrQYqad21ATzY= github.com/Azure/azure-sdk-for-go v18.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/buffalo-azure v0.1.6/go.mod h1:uZXNJaEeLQzq6xjCD0Pyz5PEVx3Gd1lHDwcXbpEbUTg= github.com/Azure/go-autorest v10.12.0+incompatible h1:6YphwUK+oXbzvCc1fd5VrnxCekwzDkpA7gUEbci2MvI= github.com/Azure/go-autorest v10.12.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= diff --git a/install.sh b/install.sh deleted file mode 100644 index 05098ae..0000000 --- a/install.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -set -e - -if test -z $GOPATH; then - export GOPATH=$HOME/go -fi - -mkdir -p $GOPATH/src/github.com/Azure/buffalo-azure -cd $GOPATH/src/github.com/Azure/buffalo-azure -git clone https://github.com/Azure/buffalo-azure.git . -q - -export head=$(git rev-parse HEAD) -export relTag=$(git tag --list --contains "$head" v*) - -if test -z $relTag; then - export relTag="$head" -fi - -dep ensure -go install --ldflags "-X github.com/Azure/buffalo-azure/cmd.version=$relTag" - -echo "Installed Buffalo-Azure Version $relTag" diff --git a/sdk/go.mod b/sdk/go.mod index 8e9c6a5..4d5dc0a 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -1,7 +1,6 @@ -module github.com/azure/buffalo-azure/sdk +module github.com/Azure/buffalo-azure/sdk require ( - github.com/Azure/buffalo-azure v0.1.6 github.com/cockroachdb/apd v1.1.0 // indirect github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c // indirect github.com/gobuffalo/buffalo v0.13.0 diff --git a/sdk/go.sum b/sdk/go.sum index b24957d..cd2c9a4 100644 --- a/sdk/go.sum +++ b/sdk/go.sum @@ -1,5 +1,3 @@ -github.com/Azure/buffalo-azure v0.1.6 h1:7sgryCXSMLgv6ZctJuRL6rmBNbG4YiheK9k76t8XGes= -github.com/Azure/buffalo-azure v0.1.6/go.mod h1:uZXNJaEeLQzq6xjCD0Pyz5PEVx3Gd1lHDwcXbpEbUTg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f h1:zvClvFQwU++UpIUBGC8YmDlfhUrweEy1R1Fj1gu5iIM=