Skip to content

Commit a13c989

Browse files
Update Go version and dependencies
Notable changes are: - Go 1.25.3 - github.com/consensys/gnark-crypto 1.19.2 - Update version number to 1.5.16 following previous 1.5.15 release This change makes significant updates to the containerized FVT test environment since current golang Docker images are only available using newer Debian releases. This change uses an image based on the latest Debian (trixie) release. Package and CLI behaviour changes between bullseye and trixie require changes to FVT scripts. Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
1 parent 746df15 commit a13c989

File tree

690 files changed

+49144
-41697
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

690 files changed

+49144
-41697
lines changed

.github/workflows/pull-request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
env:
1414
GOPATH: /opt/go
1515
PATH: /opt/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
16-
GO_VER: 1.23.5
16+
GO_VER: 1.25.3
1717

1818
permissions:
1919
contents: read
@@ -28,7 +28,7 @@ jobs:
2828
- run: sudo apt update
2929
name: Run Apt Update
3030
- uses: actions/checkout@v4
31-
name: Checkout Fabric CA Code
31+
name: Checkout Fabric CA Code
3232
- uses: actions/setup-go@v5
3333
name: Install Go
3434
with:
@@ -44,7 +44,7 @@ jobs:
4444
- run: sudo apt update
4545
name: Run Apt Update
4646
- uses: actions/checkout@v4
47-
name: Checkout Fabric CA Code
47+
name: Checkout Fabric CA Code
4848
- uses: actions/setup-go@v5
4949
name: Install Go
5050
with:

.github/workflows/release.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ name: Release
66

77
on:
88
push:
9-
tags: [ v1.* ]
9+
tags: [v1.*]
1010

1111
env:
12-
GO_VER: 1.23.5
12+
GO_VER: 1.25.3
1313
UBUNTU_VER: 22.04
1414
IMAGE_NAME: ${{ github.repository }}
1515
FABRIC_CA_VER: ${{ github.ref_name }}
@@ -37,14 +37,14 @@ jobs:
3737
steps:
3838
- uses: actions/checkout@v4
3939
name: Checkout Fabric CA Code
40-
40+
4141
- uses: actions/setup-go@v5
4242
name: Install Go
4343
with:
4444
go-version: ${{ env.GO_VER }}
4545

4646
- name: Install GCC cross-compilers
47-
if: ${{ contains(matrix.platform, 'linux') }}
47+
if: ${{ contains(matrix.platform, 'linux') }}
4848
run: |
4949
sudo apt-get update
5050
sudo apt-get -y install gcc-aarch64-linux-gnu
@@ -63,7 +63,6 @@ jobs:
6363
# <path> of the artifact may include multiple files.
6464
path: release/${{ matrix.platform }}/*.tar.gz
6565

66-
6766
# build native image using a different runner for each architecture (faster and more reliable than using qemu to build multi-architecture images on ubuntu-22.04)
6867
build-and-push-native-docker-images:
6968
name: Build and Push native image
@@ -76,15 +75,14 @@ jobs:
7675
strategy:
7776
fail-fast: false
7877
matrix:
79-
8078
runner:
81-
- ubuntu-22.04 # creates linux-amd64 images
82-
- ubuntu-22.04-arm # creates linux-arm64 images
83-
79+
- ubuntu-22.04 # creates linux-amd64 images
80+
- ubuntu-22.04-arm # creates linux-arm64 images
81+
8482
# Dynamic matrix
8583
# If owner is 'hyperledger' run job for Docker Hub and ghcr, otherwise for personal forks just run job for ghcr
8684
registry: ${{ fromJSON(github.repository_owner == 'hyperledger' && '["docker.io", "ghcr.io"]' || '["ghcr.io"]') }}
87-
85+
8886
steps:
8987
- name: Checkout
9088
uses: actions/checkout@v4
@@ -124,7 +122,7 @@ jobs:
124122
mkdir -p ${{ runner.temp }}/digests/${{ matrix.registry }}
125123
digest="${{ steps.build-and-push.outputs.digest }}"
126124
touch "${{ runner.temp }}/digests/${{ matrix.registry }}/${digest#sha256:}"
127-
125+
128126
- name: Upload digest
129127
uses: actions/upload-artifact@v4
130128
with:
@@ -148,13 +146,11 @@ jobs:
148146
strategy:
149147
fail-fast: false
150148
matrix:
151-
152149
# Dynamic matrix
153150
# If owner is 'hyperledger' run job for Docker Hub and ghcr, otherwise for personal forks just run job for ghcr
154151
registry: ${{ fromJSON(github.repository_owner == 'hyperledger' && '["docker.io", "ghcr.io"]' || '["ghcr.io"]') }}
155-
156-
steps:
157152

153+
steps:
158154
- name: Download digests
159155
uses: actions/download-artifact@v4
160156
with:
@@ -181,13 +177,13 @@ jobs:
181177
type=semver,pattern={{version}}
182178
type=semver,pattern={{major}}.{{minor}}
183179
type=semver,pattern={{major}}.{{minor}}.{{patch}}
184-
180+
185181
- name: Create manifest list and push # combines the downloaded amd64 and arm64 digests and pushes multi-architecture manifest with the tags specified above
186182
working-directory: ${{ runner.temp }}/digests/${{ matrix.registry }}
187183
run: |
188184
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
189185
$(printf '${{ matrix.registry }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
190-
186+
191187
- name: Inspect image
192188
run: |
193189
docker buildx imagetools inspect ${{ matrix.registry }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929

3030
PROJECT_NAME = fabric-ca
3131

32-
GO_VER = 1.23.5
32+
GO_VER = 1.25.3
3333
UBUNTU_VER ?= 22.04
3434
DEBIAN_VER ?= stretch
35-
BASE_VERSION ?= v1.5.15
35+
BASE_VERSION ?= v1.5.16
3636

3737
ARCH=$(shell go env GOARCH)
3838
PLATFORM=$(shell go env GOOS)-$(shell go env GOARCH)
@@ -42,7 +42,7 @@ PLATFORM=$(shell go env GOOS)-$(shell go env GOARCH)
4242
RELEASE_VERSION=$(shell echo $(BASE_VERSION) | sed -e 's/^v\(.*\)/\1/')
4343
PROJECT_VERSION=${RELEASE_VERSION}
4444

45-
PG_VER=13
45+
PG_VER=17
4646

4747
PKGNAME = github.com/hyperledger/$(PROJECT_NAME)
4848

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The remainder of this guide is intended for developers contributing to Fabric CA
1212

1313
## Prerequisites
1414

15-
* Go 1.23 installation or later
15+
* Go 1.25 installation or later
1616
* docker version 17.03 or later
1717
* docker-compose version 1.11 or later
1818

go.mod

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
module github.com/hyperledger/fabric-ca
22

3-
go 1.23.5
3+
go 1.24.0
4+
5+
toolchain go1.25.3
46

57
require (
6-
github.com/IBM/idemix v0.0.2-0.20231011101252-a4feda90f3f7
7-
github.com/IBM/idemix/bccsp/types v0.0.0-20240612072411-114d281b442d
8-
github.com/IBM/mathlib v0.0.3-0.20231011094432-44ee0eb539da
8+
github.com/IBM/idemix v0.0.2-0.20240913182345-72941a5f41cd
9+
github.com/IBM/idemix/bccsp/types v0.0.0-20240913182345-72941a5f41cd
10+
github.com/IBM/mathlib v0.0.3-0.20250709075152-a138079496c3
911
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible
1012
github.com/cloudflare/cfssl v1.4.1
1113
github.com/felixge/httpsnoop v1.0.1
@@ -23,42 +25,40 @@ require (
2325
github.com/lib/pq v1.8.0
2426
github.com/mattn/go-sqlite3 v1.14.18
2527
github.com/mitchellh/mapstructure v1.5.0
26-
github.com/onsi/ginkgo v1.14.2
27-
github.com/onsi/gomega v1.31.0
28+
github.com/onsi/ginkgo v1.16.5
29+
github.com/onsi/gomega v1.38.2
2830
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
2931
github.com/pkg/errors v0.9.1
3032
github.com/pkg/profile v1.5.0
3133
github.com/prometheus/client_golang v1.11.1
32-
github.com/spf13/cobra v1.5.0
33-
github.com/spf13/pflag v1.0.5
34+
github.com/spf13/cobra v1.8.1
35+
github.com/spf13/pflag v1.0.6
3436
github.com/spf13/viper v1.7.0
35-
github.com/stretchr/testify v1.8.4
36-
golang.org/x/crypto v0.36.0
37+
github.com/stretchr/testify v1.11.1
38+
golang.org/x/crypto v0.43.0
3739
gopkg.in/ldap.v2 v2.5.1
3840
gopkg.in/yaml.v2 v2.4.0
3941
)
4042

4143
require (
4244
github.com/IBM/idemix/bccsp/schemes/weak-bb v0.0.0-20240612072411-114d281b442d // indirect
4345
github.com/beorn7/perks v1.0.1 // indirect
44-
github.com/bits-and-blooms/bitset v1.13.0 // indirect
45-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
46-
github.com/consensys/bavard v0.1.13 // indirect
47-
github.com/consensys/gnark-crypto v0.12.1 // indirect
46+
github.com/bits-and-blooms/bitset v1.20.0 // indirect
47+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
48+
github.com/consensys/gnark-crypto v0.19.2 // indirect
4849
github.com/davecgh/go-spew v1.1.1 // indirect
4950
github.com/fsnotify/fsnotify v1.7.0 // indirect
5051
github.com/go-logfmt/logfmt v0.5.1 // indirect
5152
github.com/google/certificate-transparency-go v1.0.21 // indirect
52-
github.com/google/go-cmp v0.6.0 // indirect
53+
github.com/google/go-cmp v0.7.0 // indirect
5354
github.com/hashicorp/hcl v1.0.0 // indirect
54-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
55+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5556
github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548 // indirect
5657
github.com/kilic/bls12-381 v0.1.0 // indirect
5758
github.com/magiconair/properties v1.8.7 // indirect
5859
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
5960
github.com/miekg/pkcs11 v1.1.1 // indirect
60-
github.com/mmcloughlin/addchain v0.4.0 // indirect
61-
github.com/nxadm/tail v1.4.4 // indirect
61+
github.com/nxadm/tail v1.4.8 // indirect
6262
github.com/pelletier/go-toml v1.9.5 // indirect
6363
github.com/pmezard/go-difflib v1.0.0 // indirect
6464
github.com/prometheus/client_model v0.3.0 // indirect
@@ -67,22 +67,22 @@ require (
6767
github.com/spf13/afero v1.11.0 // indirect
6868
github.com/spf13/cast v1.6.0 // indirect
6969
github.com/spf13/jwalterweatherman v1.1.0 // indirect
70-
github.com/stretchr/objx v0.5.0 // indirect
70+
github.com/stretchr/objx v0.5.2 // indirect
7171
github.com/subosito/gotenv v1.6.0 // indirect
7272
github.com/sykesm/zap-logfmt v0.0.4 // indirect
7373
github.com/weppos/publicsuffix-go v0.5.0 // indirect
7474
github.com/zmap/zcrypto v0.0.0-20190729165852-9051775e6a2e // indirect
7575
github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb // indirect
7676
go.uber.org/multierr v1.11.0 // indirect
7777
go.uber.org/zap v1.27.0 // indirect
78-
golang.org/x/net v0.38.0 // indirect
79-
golang.org/x/sys v0.31.0 // indirect
80-
golang.org/x/text v0.23.0 // indirect
81-
google.golang.org/grpc v1.64.1 // indirect
82-
google.golang.org/protobuf v1.34.2 // indirect
78+
go.yaml.in/yaml/v3 v3.0.4 // indirect
79+
golang.org/x/net v0.45.0 // indirect
80+
golang.org/x/sys v0.37.0 // indirect
81+
golang.org/x/text v0.30.0 // indirect
82+
google.golang.org/grpc v1.65.0 // indirect
83+
google.golang.org/protobuf v1.36.7 // indirect
8384
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
8485
gopkg.in/ini.v1 v1.67.0 // indirect
8586
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8687
gopkg.in/yaml.v3 v3.0.1 // indirect
87-
rsc.io/tmplfunc v0.0.3 // indirect
8888
)

0 commit comments

Comments
 (0)