Merge pull request #1806 from dexidp/go115

chore: update Go to 1.15
2020-09-28 00:45:39 +02:00 · 2020-09-28 00:45:39 +02:00 · 641615ff58
parent 5807011b6a f3fc0c5395
commit 641615ff58
3 changed files with 3 additions and 3 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -49,7 +49,7 @@ jobs:
      - name: Set up Go
        uses: actions/setup-go@v1
        with:
-          go-version: 1.14
+          go-version: 1.15

      - name: Checkout code
        uses: actions/checkout@v2
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM golang:1.14-alpine
+FROM golang:1.15-alpine

 ARG TARGETOS
 ARG TARGETARCH
--- a/go.mod
+++ b/go.mod
@ -1,6 +1,6 @@
 module github.com/dexidp/dex

-go 1.14
+go 1.15

 require (
 	github.com/Microsoft/hcsshim v0.8.7 // indirect