From 9b73c1cb974d88cdca606da52006c06f2ee492e9 Mon Sep 17 00:00:00 2001 From: Matthew Whitehead Date: Wed, 11 Sep 2024 14:38:23 +0100 Subject: [PATCH 1/3] Upgrade to Go 1.22 Signed-off-by: Matthew Whitehead --- go.mod | 2 +- go.sum | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d8dbd98..c3c05e6 100644 --- 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 index f1c390f..404adbd 100644 --- 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= From cc01c09f4e74d09aa1d658f85f4342e349067fb5 Mon Sep 17 00:00:00 2001 From: Matthew Whitehead Date: Wed, 11 Sep 2024 14:40:53 +0100 Subject: [PATCH 2/3] Update docker and gha Signed-off-by: Matthew Whitehead --- .github/workflows/docker_main.yml | 2 +- .github/workflows/docker_release.yml | 2 +- .github/workflows/go.yml | 2 +- Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml index cba6770..2de9cdb 100644 --- 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 index f05242f..b37e34f 100644 --- 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 index 11b0b5e..c65ff42 100644 --- 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 diff --git a/Makefile b/Makefile index f5f7167..39f458d 100644 --- 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: From cb6da6528fc1b4cad5edefd41acee5bb71120d5d Mon Sep 17 00:00:00 2001 From: Matthew Whitehead Date: Wed, 11 Sep 2024 14:48:41 +0100 Subject: [PATCH 3/3] Update go gha workflow Signed-off-by: Matthew Whitehead --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index c65ff42..f11d1ef 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -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 }} .