From f2594bd575b3c27838f87f9a6a48668dbea77f73 Mon Sep 17 00:00:00 2001 From: Fedor Partanskiy Date: Wed, 15 May 2024 16:00:19 +0300 Subject: [PATCH] up go 1.22.3 Signed-off-by: Fedor Partanskiy --- .github/workflows/broken-link-checker.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/verify-build.yml | 4 +++- .github/workflows/vulnerability-scan.yml | 2 +- Makefile | 2 +- .../statecouchdb/testdata/json_documents/3_sorted.json | 8 ++++---- .../statecouchdb/testdata/json_documents/3_unsorted.json | 8 ++++---- docs/source/dev-setup/devenv.rst | 2 +- docs/source/prereqs.md | 4 ++-- go.mod | 2 +- internal/pkg/comm/server_test.go | 1 + release_notes/v3.0.0-beta.md | 2 +- vagrant/golang.sh | 2 +- 13 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.github/workflows/broken-link-checker.yml b/.github/workflows/broken-link-checker.yml index dfc8b795ca2..acb67d841a5 100644 --- a/.github/workflows/broken-link-checker.yml +++ b/.github/workflows/broken-link-checker.yml @@ -13,7 +13,7 @@ on: - .github/workflows/broken-link-checker.yml env: - GO_VER: 1.21.9 + GO_VER: 1.22.3 permissions: contents: read diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3d717ae3986..1e38491adc3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ on: - v3.* 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' }} diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml index a3e5a15ea15..f4580ebe472 100644 --- a/.github/workflows/verify-build.yml +++ b/.github/workflows/verify-build.yml @@ -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 permissions: contents: read # to fetch code (actions/checkout) @@ -37,6 +37,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 diff --git a/.github/workflows/vulnerability-scan.yml b/.github/workflows/vulnerability-scan.yml index 88d05d114fd..5108ba4fa69 100644 --- a/.github/workflows/vulnerability-scan.yml +++ b/.github/workflows/vulnerability-scan.yml @@ -30,6 +30,6 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.21.9 + go-version: 1.22.3 - name: Scan run: make scan diff --git a/Makefile b/Makefile index 51cbcf058ab..74372f48e6a 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,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) diff --git a/core/ledger/kvledger/txmgmt/statedb/statecouchdb/testdata/json_documents/3_sorted.json b/core/ledger/kvledger/txmgmt/statedb/statecouchdb/testdata/json_documents/3_sorted.json index dcf09aeace0..e0e1b9036ea 100644 --- a/core/ledger/kvledger/txmgmt/statedb/statecouchdb/testdata/json_documents/3_sorted.json +++ b/core/ledger/kvledger/txmgmt/statedb/statecouchdb/testdata/json_documents/3_sorted.json @@ -1,9 +1,9 @@ { "A": 1, "Backslash": "\\", - "Backspace": "\u0008", + "Backspace": "\b", "CarriageReturn": "\r", - "FormFeed": "\u000c", + "FormFeed": "\f", "Newline": "\n", "PublicKey": { "Curve": { @@ -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" @@ -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" } ] }, diff --git a/core/ledger/kvledger/txmgmt/statedb/statecouchdb/testdata/json_documents/3_unsorted.json b/core/ledger/kvledger/txmgmt/statedb/statecouchdb/testdata/json_documents/3_unsorted.json index 37abc60f801..b7c56edbc44 100644 --- a/core/ledger/kvledger/txmgmt/statedb/statecouchdb/testdata/json_documents/3_unsorted.json +++ b/core/ledger/kvledger/txmgmt/statedb/statecouchdb/testdata/json_documents/3_unsorted.json @@ -25,8 +25,8 @@ "Tab": "\t", "CarriageReturn": "\r", "Newline": "\n", - "FormFeed": "\u000c", - "Backspace": "\u0008", + "FormFeed": "\f", + "Backspace": "\b", "chaincode_spec": { "type": 1, "chaincode_id": { @@ -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" @@ -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" } ] } diff --git a/docs/source/dev-setup/devenv.rst b/docs/source/dev-setup/devenv.rst index a590eea6c97..516bcfb8a6b 100644 --- a/docs/source/dev-setup/devenv.rst +++ b/docs/source/dev-setup/devenv.rst @@ -47,7 +47,7 @@ Go and SoftHSM are also available from Homebrew, but make sure you install the a :: - brew install go@1.21 + brew install go@1.22 brew install softhsm Docker Desktop must be launched to complete the installation, so be sure to open diff --git a/docs/source/prereqs.md b/docs/source/prereqs.md index 179afb681cc..c92a6d6aa41 100644 --- a/docs/source/prereqs.md +++ b/docs/source/prereqs.md @@ -73,8 +73,8 @@ 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 -go version # => go1.21.9 darwin/amd64 +brew install go@1.22.3 +go version # => go1.22.3 darwin/amd64 ``` ### JQ diff --git a/go.mod b/go.mod index 16f10eb16b0..cfc32318ae5 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hyperledger/fabric -go 1.21 +go 1.22 require ( code.cloudfoundry.org/clock v1.0.0 diff --git a/internal/pkg/comm/server_test.go b/internal/pkg/comm/server_test.go index 88f1433755c..65cf92a9014 100644 --- a/internal/pkg/comm/server_test.go +++ b/internal/pkg/comm/server_test.go @@ -406,6 +406,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()) diff --git a/release_notes/v3.0.0-beta.md b/release_notes/v3.0.0-beta.md index fe8e7f54b6e..fbd9d8a54b6 100644 --- a/release_notes/v3.0.0-beta.md +++ b/release_notes/v3.0.0-beta.md @@ -37,7 +37,7 @@ All improvements and fixes as of v2.5.6 have also been included in v3.0.0-beta. Dependencies ------------ Fabric v3.0.0-beta has been tested with the following dependencies: -* Go 1.21.8 +* Go 1.22.3 * CouchDB v3.3.3 Fabric docker images on dockerhub utilize Ubuntu 20.04. diff --git a/vagrant/golang.sh b/vagrant/golang.sh index 8178b53251f..91fdf0e4ee5 100644 --- a/vagrant/golang.sh +++ b/vagrant/golang.sh @@ -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