From 7128a921f3e83a43feef75bc8ab95642c236ef82 Mon Sep 17 00:00:00 2001 From: nscuro Date: Sat, 29 Jul 2023 22:25:26 +0200 Subject: [PATCH] feat: raise baseline go version to 1.18 Signed-off-by: nscuro --- .github/workflows/ci.yml | 4 ++-- .github/workflows/goreleaser.yml | 2 +- README.md | 3 ++- go.mod | 2 +- go.sum | 4 ---- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf244f6..4b4482d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - name: Setup Go uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # tag=v4.0.1 with: - go-version: "1.19" + go-version: "1.20" check-latest: true - name: Run golangci-lint uses: golangci/golangci-lint-action@639cd343e1d3b897ff35927a75193d57cfcba299 # tag=v3.6.0 @@ -47,9 +47,9 @@ jobs: strategy: matrix: go: - - "1.17" - "1.18" - "1.19" + - "1.20" steps: - name: Setup Go uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # tag=v4.0.1 diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 9c481d4..444d02d 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Go uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # tag=v4.0.1 with: - go-version: "1.19" + go-version: "1.20" check-latest: true - name: Install cyclonedx-gomod uses: CycloneDX/gh-gomod-generate-sbom@efc74245d6802c8cefd925620515442756c70d8f # tag=v2.0.0 diff --git a/README.md b/README.md index e1644cb..807287e 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,8 @@ Also, checkout the [`examples`](./example_test.go) to get an idea of how this li | < v0.4.0 | 1.14+ | 1.2 | | == v0.4.0 | 1.14+ | 1.3 | | >= v0.5.0, < v0.7.0 | 1.15+ | 1.4 | -| >= v0.7.0 | 1.17+ | 1.0-1.4 | +| >= v0.7.0, < v0.8.0 | 1.17+ | 1.0-1.4 | +| >= v0.8.0 | 1.18+ | 1.0-1.5 | We're aiming to support all [officially supported](https://golang.org/doc/devel/release.html#policy) Go versions, plus an additional older version. diff --git a/go.mod b/go.mod index 81e39a5..07e9f1d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/CycloneDX/cyclonedx-go -go 1.17 +go 1.18 require ( github.com/bradleyjkemp/cupaloy/v2 v2.8.0 diff --git a/go.sum b/go.sum index 43e7fd4..b19e3f3 100644 --- a/go.sum +++ b/go.sum @@ -7,12 +7,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/terminalstatic/go-xsd-validate v0.1.5 h1:RqpJnf6HGE2CB/lZB1A8BYguk8uRtcvYAPLCF15qguo=