[WIP] Ci Fixes

.github/workflows/golangci-lint.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           go-version-file: go.mod
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
+        uses: golangci/golangci-lint-action@4696ba8babb6127d732c3c6dde519db15edab9ea # v6.5.1
         with:
-          version: v1.55.1
+          version: v1.61.0
           args: --timeout=8m

.github/workflows/test_crdb.yaml

@@ -25,9 +25,9 @@ jobs:
         check-latest: true
         cache: true
 
-    - uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
+    - uses: golangci/golangci-lint-action@4696ba8babb6127d732c3c6dde519db15edab9ea # v6.5.1
       with:
-        version: 'v1.55.1'
+        version: 'v1.61.0'
         args: ./storage/crdb
 
   unit-test:

.github/workflows/test_pgdb.yaml

@@ -25,9 +25,9 @@ jobs:
         check-latest: true
         cache: true
 
-    - uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
+    - uses: golangci/golangci-lint-action@4696ba8babb6127d732c3c6dde519db15edab9ea # v6.5.1
       with:
-        version: 'v1.55.1'
+        version: 'v1.61.0'
         args: ./storage/postgresql
 
   integration-and-unit-tests:
@@ -68,4 +68,4 @@ jobs:
 
     - name: Run unit tests
       run: go test -v ./storage/postgresql/... ./quota/postgresqlqm/...
-
+

README.md

@@ -73,7 +73,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:

go.mod

@@ -2,7 +2,7 @@ module github.com/google/trillian
 
 go 1.23.0
 
-toolchain go1.23.6
+toolchain go1.23.4
 
 require (
 	bitbucket.org/creachadair/shell v0.0.8

monitoring/testonly/metrics.go

@@ -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"
@@ -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"
@@ -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"

server/errors/errors.go

@@ -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

server/errors/errors_test.go

@@ -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 {