dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Makefile on Windows and use in AppVeyor build (#3748)

This commit is contained in:
Daniel Nelson 2018-02-02 12:25:59 -08:00 committed by GitHub
parent 94e603b46a
commit 0e5eb8a584
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ PREFIX := /usr/local
VERSION := $(shell git describe --exact-match --tags 2>/dev/null) VERSION := $(shell git describe --exact-match --tags 2>/dev/null)
BRANCH := $(shell git rev-parse --abbrev-ref HEAD) BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
COMMIT := $(shell git rev-parse --short HEAD) COMMIT := $(shell git rev-parse --short HEAD)
GOFILES ?= $(shell find . -name '*.go') GOFILES ?= $(shell git ls-files '*.go')
GOFMT ?= $(shell gofmt -l $(GOFILES)) GOFMT ?= $(shell gofmt -l $(GOFILES))
ifdef GOBIN ifdef GOBIN

13
appveyor.yml
View File

@ -13,20 +13,21 @@ platform: x64
install: install:
- IF NOT EXIST "C:\Cache" mkdir C:\Cache - IF NOT EXIST "C:\Cache" mkdir C:\Cache
- IF NOT EXIST "C:\Cache\go1.9.2.msi" curl -o "C:\Cache\go1.9.2.msi" https://storage.googleapis.com/golang/go1.9.2.windows-amd64.msi - IF NOT EXIST "C:\Cache\go1.9.2.msi" curl -o "C:\Cache\go1.9.2.msi" https://storage.googleapis.com/golang/go1.9.2.windows-amd64.msi
- IF NOT EXIST "C:\Cache\gnuwin32-bin.zip" curl -o "C:\Cache\gnuwin32-bin.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-bin.zip
- IF NOT EXIST "C:\Cache\gnuwin32-dep.zip" curl -o "C:\Cache\gnuwin32-dep.zip" https://dl.influxdata.com/telegraf/ci/make-3.81-dep.zip
- IF EXIST "C:\Go" rmdir /S /Q C:\Go - IF EXIST "C:\Go" rmdir /S /Q C:\Go
- msiexec.exe /i "C:\Cache\go1.9.2.msi" /quiet - msiexec.exe /i "C:\Cache\go1.9.2.msi" /quiet
- 7z x "C:\Cache\gnuwin32-bin.zip" -oC:\GnuWin32 -y
- 7z x "C:\Cache\gnuwin32-dep.zip" -oC:\GnuWin32 -y
- go version - go version
- go env - go env
build_script: build_script:
- cmd: go get github.com/sparrc/gdm - cmd: C:\GnuWin32\bin\make deps
- cmd: C:\gopath\bin\gdm restore - cmd: C:\GnuWin32\bin\make telegraf
- cmd: go build -i -o telegraf.exe ./cmd/telegraf/telegraf.go
test_script: test_script:
- cmd: go test ./plugins/inputs/ping/... - cmd: C:\GnuWin32\bin\make test-windows
- cmd: go test ./plugins/inputs/win_perf_counters/...
- cmd: go test ./plugins/inputs/win_services/...
artifacts: artifacts:
- path: telegraf.exe - path: telegraf.exe