Skip to content

Commit 3782163

Browse files
authored
Merge branch 'main' into dependabot/go_modules/golang.org/x/sync-0.17.0
2 parents 850a1cd + 37a9139 commit 3782163

File tree

6 files changed

+25
-63
lines changed

6 files changed

+25
-63
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: Checkout Code
2121

2222
- name: Install Go
23-
uses: actions/setup-go@v5
23+
uses: actions/setup-go@v6
2424
with:
2525
go-version: ${{ env.GO_VER }}
2626

@@ -67,7 +67,7 @@ jobs:
6767
name: Checkout Code
6868

6969
- name: Install Go
70-
uses: actions/setup-go@v5
70+
uses: actions/setup-go@v6
7171
with:
7272
go-version: ${{ env.GO_VER }}
7373

.github/workflows/vulnerability-scan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222
jobs:
2323
scan-scheduled:
2424
if: ${{ github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
25-
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@v2.2.1"
25+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@v2.2.2"
2626
scan-pr:
2727
if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
28-
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@v2.2.1"
28+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@v2.2.2"

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/hyperledger-labs/SmartBFT
33
go 1.24.4
44

55
require (
6-
github.com/stretchr/testify v1.11.0
6+
github.com/stretchr/testify v1.11.1
77
go.uber.org/zap v1.27.0
88
golang.org/x/sync v0.17.0
99
google.golang.org/protobuf v1.36.8

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
66
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
77
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
88
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
9-
github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=
10-
github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
9+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
10+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
1111
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
1212
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
1313
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

vendor/github.com/stretchr/testify/mock/mock.go

Lines changed: 17 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ github.com/pmezard/go-difflib/difflib
77
# github.com/stretchr/objx v0.5.2
88
## explicit; go 1.20
99
github.com/stretchr/objx
10-
# github.com/stretchr/testify v1.11.0
10+
# github.com/stretchr/testify v1.11.1
1111
## explicit; go 1.17
1212
github.com/stretchr/testify/assert
1313
github.com/stretchr/testify/assert/yaml

0 commit comments

Comments
 (0)