fix: revert to go1.20 retaining version-1 support

Signed-off-by: mikeee <[email protected]>
mikeee · Dec 7, 2023 · bfdfe63 · bfdfe63
1 parent 2ab581f
commit bfdfe63
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 18 deletions.
diff --git a/.github/workflows/dapr-bot.yml b/.github/workflows/dapr-bot.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v4
         with:
-          go-version: ~1.21
+          go-version: ~1.20
           cache-dependency-path: |
             ./.github/workflows/dapr-bot/
 

diff --git a/.github/workflows/dapr-bot/Makefile b/.github/workflows/dapr-bot/Makefile
@@ -1,4 +1,4 @@
-GO_COMPAT_VERSION=1.21
+GO_COMPAT_VERSION=1.20
 
 .PHONY: cover
 cover:

diff --git a/.github/workflows/dapr-bot/go.mod b/.github/workflows/dapr-bot/go.mod
@@ -1,6 +1,6 @@
 module github.com/dapr/go-sdk/.github/workflows/dapr-bot
 
-go 1.21
+go 1.20
 
 require (
 	github.com/google/go-github/v55 v55.0.0

diff --git a/.github/workflows/dapr-bot/go.sum b/.github/workflows/dapr-bot/go.sum
@@ -8,7 +8,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-github/v55 v55.0.0 h1:4pp/1tNMB9X/LuAhs5i0KQAE40NmiR/y6prLNb9x9cg=
 github.com/google/go-github/v55 v55.0.0/go.mod h1:JLahOTA1DnXzhxEymmFF5PP2tSS9JVNj68mSZNDwskA=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=

diff --git a/.github/workflows/release-on-tag.yaml b/.github/workflows/release-on-tag.yaml
@@ -15,7 +15,7 @@ jobs:
     - name: Setup
       uses: actions/setup-go@v3
       with:
-        go-version: ^1.21
+        go-version: ^1.20
 
     - name: Checkout
       uses: actions/checkout@v3

diff --git a/.github/workflows/test-dapr-bot.yml b/.github/workflows/test-dapr-bot.yml
@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         gover:
-          - "1.21"
+          - "1.20"
     env:
       GOVER: ${{ matrix.gover }}
       GOLANGCILINT_VER: v1.54.2

diff --git a/.github/workflows/test-on-push.yaml b/.github/workflows/test-on-push.yaml
@@ -14,7 +14,6 @@ jobs:
       fail-fast: false
       matrix:
         gover:
-          - "1.19"
           - "1.20"
           - "1.21"
     env:

diff --git a/.github/workflows/test-tooling.yml b/.github/workflows/test-tooling.yml
@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         gover:
-          - "1.21"
+          - "1.20"
         os: 
           - "ubuntu-latest"
           - "windows-latest"

diff --git a/.github/workflows/validate_examples.yaml b/.github/workflows/validate_examples.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       PYTHON_VER: 3.7
-      GOVER: "1.21"
+      GOVER: "1.20"
       GOOS: linux
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 RELEASE_VERSION  =v1.0.0-rc-3
 GDOC_PORT        =8888
-GO_COMPAT_VERSION=1.21
+GO_COMPAT_VERSION=1.20
 
 .PHONY: all
 all: help

diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module github.com/dapr/go-sdk
 
-go 1.21
-
-toolchain go1.21.5
+go 1.20
 
 require (
 	github.com/dapr/dapr v1.12.1-0.20231030205344-441017b888c5

diff --git a/go.sum b/go.sum
@@ -12,7 +12,6 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
 github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
@@ -33,7 +32,6 @@ go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLk
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
-golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

diff --git a/tools/check-lint-version/go.mod b/tools/check-lint-version/go.mod
@@ -1,8 +1,6 @@
 module github.com/dapr/go-sdk/tools/check-lint-version
 
-go 1.21
-
-toolchain go1.21.5
+go 1.20
 
 require (
 	github.com/stretchr/testify v1.8.4