From bb6f07d1474c47b9908a0c885e07b4bc3646d7a8 Mon Sep 17 00:00:00 2001 From: Mike Farah Date: Tue, 8 Sep 2020 09:43:11 +1000 Subject: [PATCH] Use latest go-lang --- .github/workflows/go.yml | 4 ++-- Dockerfile | 2 +- Dockerfile.dev | 2 +- go.mod | 2 +- snap/snapcraft.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 08a5cba4..6c35be9e 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -7,10 +7,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.14 + - name: Set up Go 1.15 uses: actions/setup-go@v1 with: - go-version: 1.14 + go-version: 1.15 id: go - name: Check out code into the Go module directory diff --git a/Dockerfile b/Dockerfile index d9a7866f..f62d8f95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14 as builder +FROM golang:1.15 as builder WORKDIR /go/src/mikefarah/yq diff --git a/Dockerfile.dev b/Dockerfile.dev index 45301225..00e6a5fc 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM golang:1.14 +FROM golang:1.15 COPY scripts/devtools.sh /opt/devtools.sh diff --git a/go.mod b/go.mod index a0eae50f..9253a567 100644 --- a/go.mod +++ b/go.mod @@ -14,4 +14,4 @@ require ( gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 ) -go 1.14 +go 1.15 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a121cfc9..b292f2ca 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -16,7 +16,7 @@ apps: parts: yq: plugin: go - go-channel: 1.14/stable + go-channel: 1.15/stable source: . source-type: git go-importpath: github.com/mikefarah/yq