Merge pull request #128 from kaleido-io/upgrade-go

Upgrade to Go 1.22
hyperledger · Sep 11, 2024 · 2b1cd9c · 2b1cd9c
2 parents 25c41ff + cb6da65
commit 2b1cd9c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml
@@ -28,7 +28,7 @@ jobs:
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
             --build-arg BASE_IMAGE=alpine:3.19 \
-            --build-arg BUILD_IMAGE=golang:1.21-alpine3.19 \
+            --build-arg BUILD_IMAGE=golang:1.22-alpine3.19 \
             --tag ghcr.io/hyperledger/firefly-fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
 
       - name: Tag release

diff --git a/.github/workflows/docker_release.yml b/.github/workflows/docker_release.yml
@@ -20,7 +20,7 @@ jobs:
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${GITHUB_REF##*/} \
             --build-arg BASE_IMAGE=alpine:3.19 \
-            --build-arg BUILD_IMAGE=golang:1.21-alpine3.19 \
+            --build-arg BUILD_IMAGE=golang:1.22-alpine3.19 \
             --tag ghcr.io/hyperledger/firefly-fabconnect:${GITHUB_REF##*/} \
             --tag ghcr.io/hyperledger/firefly-fabconnect:head \
             .

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.21'
+          go-version: "1.22"
           check-latest: true
 
       - name: Build and Test
@@ -43,5 +43,5 @@ jobs:
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
             --build-arg BASE_IMAGE=alpine:3.19 \
-            --build-arg BUILD_IMAGE=golang:1.21-alpine3.19 \
+            --build-arg BUILD_IMAGE=golang:1.22-alpine3.19 \
             --tag ghcr.io/hyperledger/firefly-fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ firefly-fabconnect: ${GOFILES}
 go-mod-tidy: .ALWAYS
 	go mod tidy
 docker:
-	docker build --build-arg BASE_IMAGE=alpine:3.19  --build-arg BUILD_IMAGE=golang:1.21-alpine3.19 -t hyperledger/firefly-fabconnect .
+	docker build --build-arg BASE_IMAGE=alpine:3.19  --build-arg BUILD_IMAGE=golang:1.22-alpine3.19 -t hyperledger/firefly-fabconnect .
 build: firefly-fabconnect-nocgo firefly-fabconnect
 .ALWAYS: ;
 clean: 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hyperledger/firefly-fabconnect
 
-go 1.21
+go 1.22
 
 require (
 	github.com/Shopify/sarama v1.38.1

diff --git a/go.sum b/go.sum
@@ -427,8 +427,6 @@ github.com/hyperledger/fabric-protos-go v0.0.0-20200424173316-dd554ba3746e/go.mo
 github.com/hyperledger/fabric-protos-go v0.0.0-20211118165945-23d738fc3553/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
 github.com/hyperledger/fabric-protos-go v0.3.2 h1:mQmbHw3lyDV2+W5b0FitV/SjM4LLDjMTQJWW9taitDM=
 github.com/hyperledger/fabric-protos-go v0.3.2/go.mod h1:WWnyWP40P2roPmmvxsUXSvVI/CF6vwY1K1UFidnKBys=
-github.com/hyperledger/fabric-sdk-go v1.0.1-0.20220617091732-e170b98fa821 h1:0VfkWCv8MPDjm+6xoD6t3yN075AQ2x2KTcLY1m5BJno=
-github.com/hyperledger/fabric-sdk-go v1.0.1-0.20220617091732-e170b98fa821/go.mod h1:JRplpKBeAvXjsBhOCCM/KvMRUbdDyhsAh80qbXzKc10=
 github.com/hyperledger/fabric-sdk-go v1.0.1-0.20240123083657-5d6ca326e01b h1:ioSmXcO2r9+Sf7QbeaCQkWuTy5uHd+4u5CtFKLJhvRU=
 github.com/hyperledger/fabric-sdk-go v1.0.1-0.20240123083657-5d6ca326e01b/go.mod h1:JRplpKBeAvXjsBhOCCM/KvMRUbdDyhsAh80qbXzKc10=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=