lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc: Update to golang 1.11.x

Browse Source 
Bump to the newer version.
This commit is contained in:
James Shubin
2019-05-05 08:28:42 -04:00
parent e3cc6309ea
commit e9257580cd
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@@ -24,21 +24,21 @@ install: 'make deps'
matrix: matrix:
fast_finish: false fast_finish: false
allow_failures: allow_failures:
- go: 1.11.x - go: 1.12.x
- go: tip - go: tip
- os: osx - os: osx
# include only one build for osx for a quicker build as the nr. of these runners are sparse # include only one build for osx for a quicker build as the nr. of these runners are sparse
include: include:
- name: "basic tests" - name: "basic tests"
go: 1.10.x go: 1.11.x
env: TEST_BLOCK=basic env: TEST_BLOCK=basic
- name: "shell tests" - name: "shell tests"
go: 1.10.x go: 1.11.x
env: TEST_BLOCK=shell env: TEST_BLOCK=shell
- name: "race tests" - name: "race tests"
go: 1.10.x go: 1.11.x
env: TEST_BLOCK=race env: TEST_BLOCK=race
- go: 1.11.x - go: 1.12.x
- go: tip - go: tip
- os: osx - os: osx
script: 'TEST_BLOCK="$TEST_BLOCK" make test' script: 'TEST_BLOCK="$TEST_BLOCK" make test'

2
Makefile
View File

@@ -149,7 +149,7 @@ GOARCH=$(lastword $(subst -, ,$*))
build/mgmt-%: $(GO_FILES) | bindata lang funcgen build/mgmt-%: $(GO_FILES) | bindata lang funcgen
@echo "Building: $(PROGRAM), os/arch: $*, version: $(SVERSION)..." @echo "Building: $(PROGRAM), os/arch: $*, version: $(SVERSION)..."
@# reassigning GOOS and GOARCH to make build command copy/pastable @# reassigning GOOS and GOARCH to make build command copy/pastable
@# go 1.10 requires specifying the package for ldflags @# go 1.10+ requires specifying the package for ldflags
@if go version | grep -qE 'go1.9'; then \ @if go version | grep -qE 'go1.9'; then \
time env GOOS=${GOOS} GOARCH=${GOARCH} go build -i -ldflags "-X main.program=$(PROGRAM) -X main.version=$(SVERSION) ${LDFLAGS}" -o $@ $(BUILD_FLAGS); \ time env GOOS=${GOOS} GOARCH=${GOARCH} go build -i -ldflags "-X main.program=$(PROGRAM) -X main.version=$(SVERSION) ${LDFLAGS}" -o $@ $(BUILD_FLAGS); \
else \ else \

4
docs/quick-start-guide.md
View File

@@ -13,7 +13,7 @@ Once you're familiar with the general idea, please start hacking...
### Installing golang ### Installing golang
* You need golang version 1.10 or greater installed. * You need golang version 1.11 or greater installed.
* To install on rpm style systems: `sudo dnf install golang` * To install on rpm style systems: `sudo dnf install golang`
* To install on apt style systems: `sudo apt install golang` * To install on apt style systems: `sudo apt install golang`
* To install on macOS systems install [Homebrew](https://brew.sh) * To install on macOS systems install [Homebrew](https://brew.sh)
@@ -89,7 +89,7 @@ required for running the _test_ suite.
### Build ### Build
* `golang` 1.10 or higher (required, available in some distros and distributed * `golang` 1.11 or higher (required, available in some distros and distributed
as a binary officially by [golang.org](https://golang.org/dl/)) as a binary officially by [golang.org](https://golang.org/dl/))
### Runtime ### Runtime

4
misc/make-deps.sh
View File

@@ -84,8 +84,8 @@ if [ $travis -eq 0 ]; then
fi fi
# if golang is too old, we don't want to fail with an obscure error later # if golang is too old, we don't want to fail with an obscure error later
if go version | grep 'go1\.[012345]\.'; then if go version | grep -e 'go1\.[0123456789]\.' -e 'go1\.10\.'; then
echo "mgmt requires go1.6 or higher." echo "mgmt recommends go1.11 or higher."
exit 1 exit 1
fi fi