Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
with:
version: v1.55.1
version: v1.61.0
args: --timeout=8m
2 changes: 1 addition & 1 deletion .github/workflows/test_crdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
with:
version: 'v1.55.1'
version: 'v1.61.0'
args: ./storage/crdb

unit-test:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_pgdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
with:
version: 'v1.55.1'
version: 'v1.61.0'
args: ./storage/postgresql

integration-and-unit-tests:
Expand Down Expand Up @@ -68,4 +68,4 @@ jobs:

- name: Run unit tests
run: go test -v ./storage/postgresql/... ./quota/postgresqlqm/...


1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

* Add `--election_system` parameter to allow selection of the election system by @osmman in https://github.com/google/trillian/pull/3721
* Add Kubernetes-based leader election system by @osmman in https://github.com/google/trillian/pull/3721
* Bump go to 1.23

## v1.7.1

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ The current state of feature implementation is recorded in the

To build and test Trillian you need:

- Go 1.22 or later (go 1.22 matches cloudbuild, and is preferred for developers
- Go 1.23 or later (go 1.23 matches cloudbuild, and is preferred for developers
that will be submitting PRs to this project).

To run many of the tests (and production deployment) you need:
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/google/trillian

go 1.22.0
go 1.23.0

toolchain go1.22.10
toolchain go1.23.4

require (
bitbucket.org/creachadair/shell v0.0.8
Expand Down
6 changes: 3 additions & 3 deletions monitoring/testonly/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func TestCounter(t *testing.T, factory monitoring.MetricFactory) {
// Use a different set of label values
// Metrics with different valued label values, are distinct
// This test is only applicable when a Metric has labels
if test.labelVals != nil && len(test.labelVals) >= 1 {
if len(test.labelVals) >= 1 {
altLabels := make([]string, len(test.labelVals))
copy(altLabels, test.labelVals)
altLabels[0] = "alt-val1"
Expand Down Expand Up @@ -151,7 +151,7 @@ func TestGauge(t *testing.T, factory monitoring.MetricFactory) {
// Use a different set of label values
// Metrics with different valued label values, are distinct
// This test is only applicable when a Metric has labels
if test.labelVals != nil && len(test.labelVals) >= 1 {
if len(test.labelVals) >= 1 {
altLabels := make([]string, len(test.labelVals))
copy(altLabels, test.labelVals)
altLabels[0] = "alt-val1"
Expand Down Expand Up @@ -223,7 +223,7 @@ func TestHistogram(t *testing.T, factory monitoring.MetricFactory) {
// Use a different set of label values
// Metrics with different valued label values, are distinct
// This test is only applicable when a Metric has labels
if test.labelVals != nil && len(test.labelVals) >= 1 {
if len(test.labelVals) >= 1 {
altLabels := make([]string, len(test.labelVals))
copy(altLabels, test.labelVals)
altLabels[0] = "alt-val1"
Expand Down
2 changes: 1 addition & 1 deletion server/errors/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
// (such as canonical SQL errors), else err is returned unmodified.
func WrapError(err error) error {
if err == sql.ErrNoRows {
return status.Errorf(codes.NotFound, err.Error())
return status.Error(codes.NotFound, err.Error())
}

return err
Expand Down
2 changes: 1 addition & 1 deletion server/errors/errors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func TestWrapError(t *testing.T) {
},
{
err: sql.ErrNoRows,
wantErr: status.Errorf(codes.NotFound, sql.ErrNoRows.Error()),
wantErr: status.Error(codes.NotFound, sql.ErrNoRows.Error()),
},
}
for _, test := range tests {
Expand Down
Loading