Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move from dep to Go modules #15

Merged
merged 3 commits into from
Jan 3, 2019
Merged

Move from dep to Go modules #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba0e35b
Move from dep to Go modules
dansimau Dec 27, 2018
76216c2
Make build pass + update README and CHANGELOG
dansimau Dec 27, 2018
d09ff54
Remove `make vendor`
dansimau Dec 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
language: go
before_install:
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
cache:
directories:
- /home/travis/.tvm
- vendor
env:
- GO111MODULE=on
go:
- "1.11.x"
install:
- make vendor
script:
- make lint
- make test
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* Fix issue with `make test` always returning true even when tests fail
* Fix race condition that could cause failures due to astro downloading the
same version of Terraform twice
* Remove godep and move to Go modules (vgo)

## 0.4.1 (October 3, 2018)

Expand Down
188 changes: 0 additions & 188 deletions Gopkg.lock
View file
Open in desktop

This file was deleted.

70 changes: 0 additions & 70 deletions Gopkg.toml
View file
Open in desktop

This file was deleted.

12 changes: 5 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export GO111MODULE=on

SHELL = /bin/bash -o pipefail

SRC = $(shell find . -name '*.go')
Expand All @@ -24,10 +26,10 @@ export PRE_COMMIT_HOOK
bin:
mkdir -p bin

bin/astro: bin vendor $(SRC)
bin/astro: bin $(SRC)
go build -o bin/astro github.com/uber/astro/astro/cli/astro

bin/tvm: bin vendor $(SRC)
bin/tvm: bin $(SRC)
go build -o bin/tvm github.com/uber/astro/astro/tvm/cli/tvm

.PHONY: clean
Expand All @@ -49,10 +51,6 @@ lint:
fi;

.PHONY: test
test: vendor
test:
go test -timeout 1m -coverprofile=.coverage.out ./... \
|grep -v -E '^\?'

.PHONY: vendor
vendor:
dep ensure
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ NOTE: Astro is currently experimental.

**Installation**

Install Astro using go get:
Install Astro using go get (Go >1.11 required):

```
go get -u github.com/uber/astro/astro/cli/astro
Expand Down
35 changes: 35 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
module github.com/uber/astro

require (
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/burl/go-version v0.0.0-20160609042920-758edfbba225
github.com/davecgh/go-spew v1.1.0 // indirect
github.com/fsnotify/fsnotify v1.4.7 // indirect
github.com/ghodss/yaml v1.0.0
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce // indirect
github.com/hashicorp/go-multierror v0.0.0-20171204182908-b7773ae21874
github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform v0.11.7
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/kr/pretty v0.1.0 // indirect
github.com/logrusorgru/aurora v0.0.0-20180419164547-d694e6f975a9
github.com/magiconair/properties v0.0.0-20180217134545-2c9e95027885 // indirect
github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747
github.com/mitchellh/mapstructure v0.0.0-20150717051158-281073eb9eb0 // indirect
github.com/oklog/ulid v0.3.0
github.com/pelletier/go-toml v0.0.0-20180323185243-66540cf1fcd2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/afero v1.1.0 // indirect
github.com/spf13/cast v1.2.0 // indirect
github.com/spf13/cobra v0.0.3
github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec // indirect
github.com/spf13/pflag v1.0.1 // indirect
github.com/spf13/viper v1.0.2
github.com/stretchr/testify v1.2.1
golang.org/x/sys v0.0.0-20171222143536-83801418e1b5 // indirect
golang.org/x/text v0.0.0-20171227012246-e19ae1496984 // indirect
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
gopkg.in/yaml.v2 v2.0.0-20171116090243-287cf08546ab // indirect
)
Loading