Merge 9e4e7ab into e294d97

mackerelio · Apr 15, 2020 · e580a69 · e580a69
2 parents e294d97 + 9e4e7ab
commit e580a69
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/appveyor.yml → .appveyor.yml b/appveyor.yml → .appveyor.yml
@@ -1,11 +1,14 @@
 version: "{build}"
 clone_folder: c:\gopath\src\github.com\mackerelio\mkr
 environment:
+  VERSION: go1.14.2
   GOPATH: c:\gopath
-  GOROOT: c:\go112
+  GOROOT: c:\tools\go
   GO111MODULE: on
 build: off
 install:
+  - appveyor DownloadFile https://dl.google.com/go/%VERSION%.windows-amd64.zip
+  - 7z x %VERSION%.windows-amd64.zip -oC:\tools\
   - set PATH=%GOROOT%\bin;%GOPATH%\bin;C:\msys64\mingw64\bin;%PATH%
 test_script:
   - go test -v ./...
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: go
 go:
-- 1.12.x
+- 1.14.x
 env:
   global:
   - GO111MODULE=on

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.12-alpine AS builder
+FROM golang:1.14-alpine AS builder
 RUN apk add --no-cache make git
 WORKDIR /go/src/github.com/mackerelio/mkr/
 COPY . .

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/mackerelio/mkr
 
-go 1.12
+go 1.14
 
 require (
 	github.com/Songmu/prompter v0.3.0