mirror of
https://github.com/anchore/syft.git
synced 2025-11-17 08:23:15 +01:00
feat: update to go 1.24.x (#3660)
* 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:
parent
a17fe480a0
commit
dce99543b2
@ -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
|
||||
|
||||
2
.github/actions/bootstrap/action.yaml
vendored
2
.github/actions/bootstrap/action.yaml
vendored
@ -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
|
||||
|
||||
2
go.mod
2
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
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user