Merge pull request #1806 from dexidp/go115

chore: update Go to 1.15
dexidp · Sep 27, 2020 · 641615f · 641615f
2 parents 5807011 + f3fc0c5
commit 641615f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14-alpine
+FROM golang:1.15-alpine
 
 ARG TARGETOS
 ARG TARGETARCH

diff --git 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