oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 16:33:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: update to go 1.24.x (#3660)

Browse Source 
* feat: update to go 1.24.x

Update to building with go 1.24.x so that the main module version gets
set during `go build`

Signed-off-by: Weston Steimel <author@code.w.steimel.me.uk>

* chore: bump golangci-lint for go 1.24.x support

Signed-off-by: Weston Steimel <author@code.w.steimel.me.uk>

* chore: appease the updated linter

Signed-off-by: Weston Steimel <author@code.w.steimel.me.uk>

* chore: fix test logging for go 1.24

Signed-off-by: Weston Steimel <author@code.w.steimel.me.uk>

---------

Signed-off-by: Weston Steimel <author@code.w.steimel.me.uk>
This commit is contained in:
Weston Steimel 2025-02-13 15:08:10 +00:00 committed by GitHub
parent a17fe480a0
commit dce99543b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.binny.yaml
View File

@ -26,7 +26,7 @@ tools:
# used for linting # used for linting
- name: golangci-lint - name: golangci-lint
version: version:
want: v1.63.4 want: v1.64.2
method: github-release method: github-release
with: with:
repo: golangci/golangci-lint repo: golangci/golangci-lint

2
.github/actions/bootstrap/action.yaml vendored
View File

@ -5,7 +5,7 @@ inputs:
go-version: go-version:
description: "Go version to install" description: "Go version to install"
required: true required: true
default: "1.23.x" default: "1.24.x"
go-dependencies: go-dependencies:
description: "Download go dependencies" description: "Download go dependencies"
required: true required: true

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/anchore/syft module github.com/anchore/syft
go 1.23.2 go 1.24.0
require ( require (
github.com/CycloneDX/cyclonedx-go v0.9.2 github.com/CycloneDX/cyclonedx-go v0.9.2

4
syft/pkg/cataloger/java/archive_parser_test.go
View File

@ -1437,7 +1437,7 @@ func generateJavaBuildFixture(t *testing.T, fixturePath string) {
} }
makeTask := strings.TrimPrefix(fixturePath, "test-fixtures/java-builds/") 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() cwd, err := os.Getwd()
if err != nil { if err != nil {
@ -1462,7 +1462,7 @@ func generateJavaMetadataJarFixture(t *testing.T, fixtureName string, fileExtens
} }
makeTask := filepath.Join("cache", fixtureName+"."+fileExtension) 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() cwd, err := os.Getwd()
if err != nil { if err != nil {

3
syft/pkg/cataloger/lua/rockspec_parser.go
View File

@ -201,10 +201,9 @@ func parseRockspecNode(data []byte, i *int, locals map[string]string) (*rockspec
if c == '{' && c2 == '}' { if c == '{' && c2 == '}' {
*i = offset + 1 *i = offset + 1
return &rockspecNode{}, nil return &rockspecNode{}, nil
} else {
*i = offset
} }
*i = offset
parsing.SkipWhitespace(data, i) parsing.SkipWhitespace(data, i)
obj, err := parseRockspecBlock(data, i, locals) obj, err := parseRockspecBlock(data, i, locals)