Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into flag-context-gen
Browse files Browse the repository at this point in the history
  • Loading branch information
meatballhat committed Jul 12, 2016
2 parents 8d976fe + 3a52162 commit 8a7c9b1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ matrix:
include:
- go: 1.6.2
os: osx
- go: 1.1.2
install: go get -v .
before_script: echo skipping gfmxr on $TRAVIS_GO_VERSION
script:
- ./runtests vet
- ./runtests test

before_script:
- go get github.com/urfave/gfmxr/...
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
### Added
- Flag type code generation via `go generate`

### Changed
- Raise minimum tested/supported Go version to 1.2+

## [1.18.0] - 2016-06-27
### Added
- `./runtests` test runner with coverage tracking by default
Expand Down
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,16 @@ organized, and expressive!

## Installation

Make sure you have a working Go environment. Go version 1.1+ is required for
core cli, whereas use of the [`./altsrc`](./altsrc) input extensions requires Go
version 1.2+. [See the install
instructions](http://golang.org/doc/install.html).
Make sure you have a working Go environment. Go version 1.2+ is supported. [See
the install instructions for Go](http://golang.org/doc/install.html).

To install cli, simply run:
```
$ go get github.com/urfave/cli
```

Make sure your `PATH` includes to the `$GOPATH/bin` directory so your commands
can be easily used:
Make sure your `PATH` includes the `$GOPATH/bin` directory so your commands can
be easily used:
```
export PATH=$PATH:$GOPATH/bin
```
Expand Down

0 comments on commit 8a7c9b1

Please sign in to comment.