Merge pull request #356 from moul/dev/moul/go120

moul · Jul 31, 2023 · e6431f7 · e6431f7
2 parents 4d17a62 + c8f2b0a
commit e6431f7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -47,7 +47,7 @@ jobs:
     strategy:
       matrix:
         golang:
-          - 1.19.x
+          - 1.20.x
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -74,7 +74,7 @@ jobs:
     strategy:
       matrix:
         golangci_lint: [v1.50.1]
-        golang: [1.19.x]
+        golang: [1.20.x]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
@@ -93,7 +93,7 @@ jobs:
     strategy:
       matrix:
         golang:
-          - 1.19.x
+          - 1.20.x
     steps:
       - uses: actions/checkout@v3
       - name: Install Go
@@ -109,7 +109,7 @@ jobs:
     strategy:
       matrix:
         golang:
-          - 1.19.x
+          - 1.20.x
     env:
       OS: macos-latest
       GOLANG: ${{ matrix.golang }}
@@ -149,12 +149,8 @@ jobs:
     strategy:
       matrix:
         golang:
-          #- 1.14.x
-          #- 1.15.x
-          #- 1.16.x
-          #- 1.17.x
-          - 1.18.x
           - 1.19.x
+          - 1.20.x
     env:
       OS: ubuntu-latest
       GOLANG: ${{ matrix.golang }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        golang: [1.19.x]
+        golang: [1.20.x]
     steps:
       -
         name: Checkout

diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ ARG             VCS_REF
 ARG             VERSION
 
 # build
-FROM            golang:1.19.5-alpine as builder
+FROM            golang:1.20-alpine as builder
 RUN             apk add --no-cache git gcc musl-dev make
 ENV             GO111MODULE=on
 WORKDIR         /go/src/moul.io/golang-repo-template

diff --git a/go.mod b/go.mod