Skip to content

Commit

Permalink
bump min golang (#339)
Browse files Browse the repository at this point in the history
  • Loading branch information
abe-winter authored Sep 5, 2024
1 parent 2241e7e commit da7ab37
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/license_finder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ jobs:
license_finder:
name: Audit 3rd-Party Licenses
runs-on: ubuntu-latest
container:
image: ghcr.io/viamrobotics/canon:amd64-cache
options: --platform linux/amd64
container: ghcr.io/viamrobotics/rdk-devenv:amd64
timeout-minutes: 30

steps:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.viam.com/utils

go 1.20
go 1.21.13

require (
cloud.google.com/go/compute/metadata v0.2.3
Expand Down
4 changes: 2 additions & 2 deletions logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ type ZapCompatibleLogger interface {
// calling its `Sublogger` method if it is an RDK logger, or its `Named` method if it is a Zap logger.
// If neither method is available, it logs a debug message and returns the original logger.
func Sublogger(inp ZapCompatibleLogger, subname string) (loggerRet ZapCompatibleLogger) {
loggerRet = inp
loggerRet = inp //nolint:wastedassign

// loggerRet is initialized to inp as a return value and is intentionally never re-assigned
// before calling functions that can panic so that defer + recover returns the original logger
Expand Down Expand Up @@ -88,7 +88,7 @@ func Sublogger(inp ZapCompatibleLogger, subname string) (loggerRet ZapCompatible
// calling its `WithFields` method if it is an RDK logger, or its `With` method if it is a Zap logger.
// If neither method is available, it logs a debug message and returns the original logger.
func AddFieldsToLogger(inp ZapCompatibleLogger, args ...interface{}) (loggerRet ZapCompatibleLogger) {
loggerRet = inp
loggerRet = inp //nolint:wastedassign

// loggerRet is initialized to inp as a return value and is intentionally never re-assigned
// before calling functions that can panic so that defer + recover returns the original logger
Expand Down

0 comments on commit da7ab37

Please sign in to comment.