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.

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

Revert "Addressing @phinze's comments from https://github.com/hashicorp/terraform/pull/4401" #3

Merged
merged 1 commit into from
Apr 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ terraform.tfplan
terraform.tfstate
bin/
modules-dev/
/pkg/
pkg/
vendor/
website/.vagrant
website/.bundle
website/build
Expand All @@ -21,4 +22,3 @@ website/node_modules
.*.swp
.idea
*.test
*.iml
10 changes: 3 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,12 @@ sudo: false
language: go

go:
- 1.6
- 1.5

# Need to ensure at least something remains in the install stanza to opt out of
# Travis's built-in 'godep restore', which will fail Travis
# See https://docs.travis-ci.com/user/languages/go#godep-support
install:
- echo noop
install: make updatedeps

script:
- make test vet
- make test

branches:
only:
Expand Down
5 changes: 4 additions & 1 deletion BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,15 @@ vagrant ssh
# The current "terraform" directory is then sync'd into the gopath
cd /opt/gopath/src/github.com/hashicorp/terraform/

# Fetch dependencies
make updatedeps

# Verify unit tests pass
make test

# Build the release
# This generates binaries for each platform and places them in the pkg folder
make bin
make release
```

After running these commands, you should have binaries for all supported
Expand Down
1,818 changes: 812 additions & 1,006 deletions CHANGELOG.md

Large diffs are not rendered by default.

504 changes: 42 additions & 462 deletions CONTRIBUTING.md

Large diffs are not rendered by default.

Loading