Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: ['1.25']
go-version: ['1.26']

steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version: '1.25'
go-version: '1.26'

- name: golangci-lint
uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9
Expand Down
25 changes: 22 additions & 3 deletions encode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,32 @@ func TestEncodeRoundTrip(t *testing.T) {
if p.LicenseDeclared != want.LicenseDeclared {
t.Errorf("LicenseDeclared = %q, want %q", p.LicenseDeclared, want.LicenseDeclared)
}
if f == FormatCycloneDXJSON && !slices.Equal(p.Properties, want.Properties) {
t.Errorf("Properties = %#v, want %#v", p.Properties, want.Properties)
}
})
}
}

func TestEncodeCycloneDXPropertiesRoundTrip(t *testing.T) {
src := sampleSBOM()
var buf bytes.Buffer
if err := Encode(&buf, src, FormatCycloneDXJSON); err != nil {
t.Fatalf("Encode: %v", err)
}
out, err := Parse(buf.Bytes())
if err != nil {
t.Fatalf("Parse: %v\n%s", err, buf.String())
}
for i := range out.Packages {
if out.Packages[i].Name != "lodash" {
continue
}
if !slices.Equal(out.Packages[i].Properties, src.Packages[0].Properties) {
t.Errorf("Properties = %#v, want %#v", out.Packages[i].Properties, src.Packages[0].Properties)
}
return
}
t.Fatalf("lodash not round-tripped:\n%s", buf.String())
}

func TestEncodeCycloneDXXML(t *testing.T) {
var buf bytes.Buffer
if err := Encode(&buf, sampleSBOM(), FormatCycloneDXXML); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/git-pkgs/sbom

go 1.25.6
go 1.26.7