From 074d3887d499d81262be3555de3eddb12d183dc1 Mon Sep 17 00:00:00 2001 From: Enrique Lacal Date: Tue, 10 Sep 2024 14:54:27 +0100 Subject: [PATCH 1/3] fix makefile golang version Signed-off-by: Enrique Lacal --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 39f5b07..fdbb973 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ firefly-fabconnect: ${GOFILES} go-mod-tidy: .ALWAYS go mod tidy docker: - docker build --platform linux/amd64 --build-arg BASE_IMAGE=ubuntu:22.04 --build-arg BUILD_IMAGE=golang:1.21-bullseye -t hyperledger/firefly-fabconnect . + docker build --platform linux/amd64 --build-arg BASE_IMAGE=ubuntu:22.04 --build-arg BUILD_IMAGE=golang:1.22-bullseye -t hyperledger/firefly-fabconnect . build: firefly-fabconnect-nocgo firefly-fabconnect .ALWAYS: ; clean: From b4cfea1e3fc2a80298e0fc8a4b037439d0b41ede Mon Sep 17 00:00:00 2001 From: Enrique Lacal Date: Tue, 10 Sep 2024 14:58:05 +0100 Subject: [PATCH 2/3] fix go version on workflow Signed-off-by: Enrique Lacal --- .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 9be4436..43a7cfd 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 From 4ae38ef686ed74d28fa58bc3084746eeb8b88ae1 Mon Sep 17 00:00:00 2001 From: Enrique Lacal Date: Tue, 10 Sep 2024 15:01:35 +0100 Subject: [PATCH 3/3] fix image in workflow Signed-off-by: Enrique Lacal --- .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 43a7cfd..ec72bf6 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=ubuntu:22.04 \ - --build-arg BUILD_IMAGE=golang:1.21-bullseye \ + --build-arg BUILD_IMAGE=golang:1.22-bullseye \ --tag ghcr.io/hyperledger/firefly-fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .