diff --git a/.binny.yaml b/.binny.yaml index 6757cddb6..34f56734a 100644 --- a/.binny.yaml +++ b/.binny.yaml @@ -26,7 +26,7 @@ tools: # used for linting - name: golangci-lint version: - want: v1.63.4 + want: v1.64.2 method: github-release with: repo: golangci/golangci-lint diff --git a/.github/actions/bootstrap/action.yaml b/.github/actions/bootstrap/action.yaml index 641bac7b9..9e9c1892d 100644 --- a/.github/actions/bootstrap/action.yaml +++ b/.github/actions/bootstrap/action.yaml @@ -5,7 +5,7 @@ inputs: go-version: description: "Go version to install" required: true - default: "1.23.x" + default: "1.24.x" go-dependencies: description: "Download go dependencies" required: true diff --git a/go.mod b/go.mod index 10c798b5a..8cc9ade53 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/anchore/syft -go 1.23.2 +go 1.24.0 require ( github.com/CycloneDX/cyclonedx-go v0.9.2 diff --git a/syft/pkg/cataloger/java/archive_parser_test.go b/syft/pkg/cataloger/java/archive_parser_test.go index 4fb439bce..a4bfc605e 100644 --- a/syft/pkg/cataloger/java/archive_parser_test.go +++ b/syft/pkg/cataloger/java/archive_parser_test.go @@ -1437,7 +1437,7 @@ func generateJavaBuildFixture(t *testing.T, fixturePath string) { } makeTask := strings.TrimPrefix(fixturePath, "test-fixtures/java-builds/") - t.Logf(color.Bold.Sprintf("Generating Fixture from 'make %s'", makeTask)) + t.Log(color.Bold.Sprintf("Generating Fixture from 'make %s'", makeTask)) cwd, err := os.Getwd() if err != nil { @@ -1462,7 +1462,7 @@ func generateJavaMetadataJarFixture(t *testing.T, fixtureName string, fileExtens } makeTask := filepath.Join("cache", fixtureName+"."+fileExtension) - t.Logf(color.Bold.Sprintf("Generating Fixture from 'make %s'", makeTask)) + t.Log(color.Bold.Sprintf("Generating Fixture from 'make %s'", makeTask)) cwd, err := os.Getwd() if err != nil { diff --git a/syft/pkg/cataloger/lua/rockspec_parser.go b/syft/pkg/cataloger/lua/rockspec_parser.go index e8d5f5c42..a71f0e6d1 100644 --- a/syft/pkg/cataloger/lua/rockspec_parser.go +++ b/syft/pkg/cataloger/lua/rockspec_parser.go @@ -201,10 +201,9 @@ func parseRockspecNode(data []byte, i *int, locals map[string]string) (*rockspec if c == '{' && c2 == '}' { *i = offset + 1 return &rockspecNode{}, nil - } else { - *i = offset } + *i = offset parsing.SkipWhitespace(data, i) obj, err := parseRockspecBlock(data, i, locals)