From b769ec2e2026e4c8c61bc4d90314020f4fc968f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20St=C3=A4ber?= Date: Thu, 2 Jan 2020 23:22:13 +0100 Subject: [PATCH] fix appveyor build problem --- .appveyor.yml | 21 ++++++--------------- .travis.yml | 2 +- go.mod | 2 ++ 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 4cb2fd1f..4729e8c1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,10 +5,10 @@ os: Windows Server 2012 R2 clone_folder: - C:\go\src\github.com\fstab\grok_exporter + C:\grok_exporter environment: - PATH: c:\go\bin;C:\msys64\mingw64\bin;%PATH% + PATH: C:\go\bin;C:\msys64\mingw64\bin;%PATH% GOPATH: c:\go CC: x86_64-w64-mingw32-gcc CGO_ENABLED: 1 @@ -48,22 +48,13 @@ install: # -------------------------------------------------------------------------- build_script: - - cd c:\go\src\github.com\fstab\grok_exporter + - cd c:\grok_exporter - git submodule update --init --recursive - set GO111MODULE=on - go version - - go test github.com/fstab/grok_exporter - - go test github.com/fstab/grok_exporter/config - - go test github.com/fstab/grok_exporter/config/v1 - - go test github.com/fstab/grok_exporter/config/v2 - - go test github.com/fstab/grok_exporter/exporter - - go test github.com/fstab/grok_exporter/oniguruma - - go test github.com/fstab/grok_exporter/tailer - - go test github.com/fstab/grok_exporter/tailer/fswatcher - - go test github.com/fstab/grok_exporter/tailer/glob - - go test github.com/fstab/grok_exporter/template - - go install github.com/fstab/grok_exporter - - C:\cygwin\bin\bash -c "cd /cygdrive/c/go/src/github.com/fstab/grok_exporter ; PATH='/usr/sbin:/usr/bin:/sbin:/bin' ./integration-test.sh" + - go test ./... + - go install + - C:\cygwin\bin\bash -c "cd /cygdrive/c/grok_exporter ; PATH='/usr/sbin:/usr/bin:/sbin:/bin' ./integration-test.sh" # Print the linked DLLs, so we can check that grok_exporter does not have # a runtime dependency on Oniguruma. diff --git a/.travis.yml b/.travis.yml index 25874f62..15c4e2f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - "1.12" + - "1.13" os: - linux diff --git a/go.mod b/go.mod index 2743bab3..6e1e7aa4 100644 --- a/go.mod +++ b/go.mod @@ -8,3 +8,5 @@ require ( github.com/sirupsen/logrus v1.4.2 gopkg.in/yaml.v2 v2.2.2 ) + +go 1.13