fix: upgrade to go 1.21

Signed-off-by: SamMayWork <[email protected]>
hyperledger · Jan 11, 2024 · ac44d47 · ac44d47
1 parent 79011f1
commit ac44d47
Show file tree

Hide file tree

Showing 9 changed files with 152 additions and 13 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Build and Test
         run: make
@@ -38,7 +38,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Build Docker image
         run: make docker
@@ -130,7 +130,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Download Docker image
         uses: actions/download-artifact@v3

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version: 1.21
 
       - name: Update manifest to latest commit for every service
         run: ./manifestgen.sh head
@@ -91,7 +91,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version: 1.21
 
       - name: Update manifest to latest commit for every service
         run: ./manifestgen.sh head

diff --git a/docs/contributors/dev_environment_setup.md b/docs/contributors/dev_environment_setup.md
@@ -23,7 +23,7 @@ This guide will walk you through setting up your machine for contributing to Fir
 
 You will need a few prerequisites set up on your machine before you can build FireFly from source. We recommend doing development on macOS, Linux, or WSL 2.0.
 
-- [Go 1.18](https://golang.org/dl/)
+- [Go 1.21](https://golang.org/dl/)
 - make
 - GCC
 - openssl

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hyperledger/firefly
 
-go 1.19
+go 1.21
 
 require (
 	blockwatch.cc/tzgo v1.17.1

diff --git a/go.work.sum b/go.work.sum
diff --git a/manifest.json b/manifest.json
@@ -41,17 +41,17 @@
   },
   "build": {
     "firefly-builder": {
-      "image": "golang:1.19-alpine3.16"
+      "image": "golang:1.21-alpine3.19"
     },
     "fabric-builder": {
-      "image": "golang:1.19-alpine3.16",
+      "image": "golang:1.21-alpine3.19",
       "platform": "linux/x86_64"
     },
     "solidity-builder": {
       "image": "ethereum/solc:0.8.11-alpine"
     },
     "base": {
-      "image": "alpine:3.16"
+      "image": "alpine:3.19"
     }
   },
   "ui": {

diff --git a/smart_contracts/fabric/custompin-sample/go.mod b/smart_contracts/fabric/custompin-sample/go.mod
@@ -1,6 +1,6 @@
 module github.com/hyperledger/firefly/custompin_sample
 
-go 1.18
+go 1.21
 
 require (
 	github.com/hyperledger/fabric-chaincode-go v0.0.0-20210718160520-38d29fabecb9

diff --git a/smart_contracts/fabric/firefly-go/Dockerfile b/smart_contracts/fabric/firefly-go/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18
+FROM golang:1.21
 
 WORKDIR /app
 COPY  firefly.go go.mod go.sum ./

diff --git a/smart_contracts/fabric/firefly-go/go.mod b/smart_contracts/fabric/firefly-go/go.mod
@@ -1,6 +1,6 @@
 module github.com/hyperledger/firefly/chaincode-go
 
-go 1.18
+go 1.21
 
 require (
 	github.com/golang/protobuf v1.4.3
-Original file line number
+Diff line change
@@ Expand Up @@
     You will need a few prerequisites set up on your machine before you can build FireFly from source. We recommend doing development on macOS, Linux, or WSL 2.0.
-    - [Go 1.18](https://golang.org/dl/)
+    - [Go 1.21](https://golang.org/dl/)
     - make
     - GCC
     - openssl
@@ Expand Down @@