Skip to content

Commit

Permalink
Bump Go to 1.22.3 (backport release-2.5) (#4866)
Browse files Browse the repository at this point in the history
Bump Go to 1.22.3.
See details in #4861.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
  • Loading branch information
denyeart committed May 21, 2024
1 parent 48546ce commit 6ea5057
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
tags: [ v2.* ]

env:
GO_VER: 1.21.9
GO_VER: 1.22.3
UBUNTU_VER: 20.04
FABRIC_VER: ${{ github.ref_name }}
DOCKER_REGISTRY: ${{ github.repository_owner == 'hyperledger' && 'docker.io' || 'ghcr.io' }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/verify-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
env:
GOPATH: /opt/go
PATH: /opt/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
GO_VER: 1.21.9
GO_VER: 1.22.3

jobs:
basic-checks:
Expand All @@ -32,6 +32,8 @@ jobs:
name: Unit Tests
needs: basic-checks
runs-on: ${{ github.repository == 'hyperledger/fabric' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
env:
GOEXPERIMENT: nocoverageredesign
steps:
- uses: actions/checkout@v4
name: Checkout Fabric Code
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ METADATA_VAR += CommitSHA=$(EXTRA_VERSION)
METADATA_VAR += BaseDockerLabel=$(BASE_DOCKER_LABEL)
METADATA_VAR += DockerNamespace=$(DOCKER_NS)

GO_VER = 1.21.9
GO_VER = 1.22.3
GO_TAGS ?=

RELEASE_EXES = orderer $(TOOLS_EXES)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"A": 1,
"Backslash": "\\",
"Backspace": "\u0008",
"Backspace": "\b",
"CarriageReturn": "\r",
"FormFeed": "\u000c",
"FormFeed": "\f",
"Newline": "\n",
"PublicKey": {
"Curve": {
Expand All @@ -28,7 +28,7 @@
"Args": [
"deploy",
"ch1",
"\nU\u0008\u0001\u0012I\n=github.com/hyperledger/fabric/examples/chaincode/go/marbles02\u0012\u0005mycc1\u001a\u00010\u001a\u0006\n\u0004init",
"\nU\b\u0001\u0012I\n=github.com/hyperledger/fabric/examples/chaincode/go/marbles02\u0012\u0005mycc1\u001a\u00010\u001a\u0006\n\u0004init",
"",
"escc",
"vscc"
Expand All @@ -48,7 +48,7 @@
"writes": [
{
"key": "mycc1",
"value": "\n\u0005mycc1\u0012\u00010\u001a\u0004escc\"\u0004vscc*\u0017\u0012\u0008\u0012\u0006\u0008\u0001\u0012\u0002\u0008\u0000\u001a\u000b\u0012\t\n\u0007DEFAULT2D\n ��$˞�K݂o�pJ{��_��(\u0015ݮ�\u003e\u001a�c�\tS�\u0012 \u0012V�1\u000e\u000e��\u0010Q�i�$�VtV\\\u0018L(�I����F�: E��ؿk�\u003c\u0015�x��F\r\u0005��C9\u0001\t�bA\u000e\u0018�5�B\u0019\u0012\u0008\u0012\u0006\u0008\u0001\u0012\u0002\u0008\u0000\u001a\r\u0012\u000b\n\u0007DEFAULT\u0010\u0001"
"value": "\n\u0005mycc1\u0012\u00010\u001a\u0004escc\"\u0004vscc*\u0017\u0012\b\u0012\u0006\b\u0001\u0012\u0002\b\u0000\u001a\u000b\u0012\t\n\u0007DEFAULT2D\n ��$˞�K݂o�pJ{��_��(\u0015ݮ�\u003e\u001a�c�\tS�\u0012 \u0012V�1\u000e\u000e��\u0010Q�i�$�VtV\\\u0018L(�I����F�: E��ؿk�\u003c\u0015�x��F\r\u0005��C9\u0001\t�bA\u000e\u0018�5�B\u0019\u0012\b\u0012\u0006\b\u0001\u0012\u0002\b\u0000\u001a\r\u0012\u000b\n\u0007DEFAULT\u0010\u0001"
}
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"Tab": "\t",
"CarriageReturn": "\r",
"Newline": "\n",
"FormFeed": "\u000c",
"Backspace": "\u0008",
"FormFeed": "\f",
"Backspace": "\b",
"chaincode_spec": {
"type": 1,
"chaincode_id": {
Expand All @@ -36,7 +36,7 @@
"Args": [
"deploy",
"ch1",
"\nU\u0008\u0001\u0012I\n=github.com/hyperledger/fabric/examples/chaincode/go/marbles02\u0012\u0005mycc1\u001a\u00010\u001a\u0006\n\u0004init",
"\nU\b\u0001\u0012I\n=github.com/hyperledger/fabric/examples/chaincode/go/marbles02\u0012\u0005mycc1\u001a\u00010\u001a\u0006\n\u0004init",
"",
"escc",
"vscc"
Expand All @@ -55,7 +55,7 @@
"writes": [
{
"key": "mycc1",
"value": "\n\u0005mycc1\u0012\u00010\u001a\u0004escc\"\u0004vscc*\u0017\u0012\u0008\u0012\u0006\u0008\u0001\u0012\u0002\u0008\u0000\u001a\u000b\u0012\t\n\u0007DEFAULT2D\n ��$˞�K݂o�pJ{��_��(\u0015ݮ�\u003e\u001a�c�\tS�\u0012 \u0012V�1\u000e\u000e��\u0010Q�i�$�VtV\\\u0018L(�I����F�: E��ؿk�\u003c\u0015�x��F\r\u0005��C9\u0001\t�bA\u000e\u0018�5�B\u0019\u0012\u0008\u0012\u0006\u0008\u0001\u0012\u0002\u0008\u0000\u001a\r\u0012\u000b\n\u0007DEFAULT\u0010\u0001"
"value": "\n\u0005mycc1\u0012\u00010\u001a\u0004escc\"\u0004vscc*\u0017\u0012\b\u0012\u0006\b\u0001\u0012\u0002\b\u0000\u001a\u000b\u0012\t\n\u0007DEFAULT2D\n ��$˞�K݂o�pJ{��_��(\u0015ݮ�\u003e\u001a�c�\tS�\u0012 \u0012V�1\u000e\u000e��\u0010Q�i�$�VtV\\\u0018L(�I����F�: E��ؿk�\u003c\u0015�x��F\r\u0005��C9\u0001\t�bA\u000e\u0018�5�B\u0019\u0012\b\u0012\u0006\b\u0001\u0012\u0002\b\u0000\u001a\r\u0012\u000b\n\u0007DEFAULT\u0010\u0001"
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions docs/source/prereqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ Optional: Install the latest Fabric supported version of [Go](https://golang.org
installed (only required if you will be writing Go chaincode or SDK applications).

```shell
$ brew install go@1.21.9
$ brew install go@1.22.3
$ go version
go1.21.9 darwin/amd64
go1.22.3 darwin/amd64
```

### JQ
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric

go 1.21
go 1.22

require (
code.cloudfoundry.org/clock v1.0.0
Expand Down
1 change: 1 addition & 0 deletions internal/pkg/comm/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@ func TestNewGRPCServerInvalidParameters(t *testing.T) {
"listen tcp: unknown port tcp/1BBB",
"listen tcp: address tcp/1BBB: unknown port",
"listen tcp: lookup tcp/1BBB: Servname not supported for ai_socktype",
"listen tcp: lookup tcp/1BBB: unknown port",
}
require.Error(t, err, fmt.Sprintf("[%s], [%s] [%s] or [%s] expected", msgs[0], msgs[1], msgs[2], msgs[3]))
require.Contains(t, msgs, err.Error())
Expand Down
2 changes: 1 addition & 1 deletion vagrant/golang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0

GOROOT='/opt/go'
GO_VERSION=1.21.9
GO_VERSION=1.22.3

# ----------------------------------------------------------------
# Install Golang
Expand Down

0 comments on commit 6ea5057

Please sign in to comment.