Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
drop references to go 1.3 and replace them with go 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
mischief committed Jun 29, 2015
1 parent 463825e commit b838f8b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ matrix:
include:
- go: 1.4
env: TOOLS_CMD=golang.org/x/tools/cmd
- go: 1.3
env: TOOLS_CMD=code.google.com/p/go.tools/cmd

install:
- go get ${TOOLS_CMD}/cover
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ After you have machines configured (check `fleetctl list-machines`), get to work

### Building

fleet must be built with Go 1.3+ on a Linux machine. Simply run `./build` and then copy the binaries out of bin/ onto each of your machines. The tests can similarly be run by simply invoking `./test`.
fleet must be built with Go 1.4+ on a Linux machine. Simply run `./build` and then copy the binaries out of bin/ onto each of your machines. The tests can similarly be run by simply invoking `./test`.

If you're on a machine without Go 1.3+ but you have Docker installed, run `./build-docker` to compile the binaries instead.
If you're on a machine without Go 1.4+ but you have Docker installed, run `./build-docker` to compile the binaries instead.

## Project Details

Expand Down
2 changes: 1 addition & 1 deletion build-aci
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tag=$1
tgt=$(mktemp -d)

# Build fleet inside
docker run -v $PWD:/opt/fleet google/golang:1.3.1 /bin/bash -c "cd /opt/fleet && ./build"
docker run -v $PWD:/opt/fleet google/golang:1.4 /bin/bash -c "cd /opt/fleet && ./build"

# Generate manifest into target tmp dir
cat <<DF >${tgt}/manifest
Expand Down
2 changes: 1 addition & 1 deletion build-docker
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash -e

docker run -v $PWD:/opt/fleet google/golang:1.3.1 /bin/bash -c "cd /opt/fleet && ./build"
docker run -v $PWD:/opt/fleet google/golang:1.4 /bin/bash -c "cd /opt/fleet && ./build"
2 changes: 1 addition & 1 deletion test-docker
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash -e

docker run -v $PWD:/opt/fleet google/golang:1.3.1 /bin/bash -c "cd /opt/fleet && ./test"
docker run -v $PWD:/opt/fleet google/golang:1.4 /bin/bash -c "cd /opt/fleet && ./test"

0 comments on commit b838f8b

Please sign in to comment.