Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Update Golang to version 1.23.1 #82

Merged
merged 6 commits into from
Oct 7, 2024
Merged

chore(deps): Update Golang to version 1.23.1 #82

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6702447
chore: fix lint and upgrade deps
manifestori Oct 1, 2024
5a2e6e4
chore: bump lint action
manifestori Oct 1, 2024
e8d9e96
chore: bump lint action
manifestori Oct 1, 2024
221896f
Merge pull request #1 from manifest-cyber/fix-review-issues
devon-manifest Oct 1, 2024
5df8e1a
Add back check-latest to setup-go action
devon-manifest Oct 1, 2024
23ae4c6
Update .github/workflows/lint.yml
devon-manifest Oct 3, 2024
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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind",
"features": {
"ghcr.io/devcontainers/features/go:1": {
"version": "1.21.5"
"version": "1.23.1"
},
"ghcr.io/devcontainers/features/docker-in-docker:2": {
"moby": true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: '1.22'
go-version-file: ./go.mod
check-latest: true

- name: govulncheck
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: '1.22'
go-version-file: ./go.mod
check-latest: true

- name: setup-ruleguard
Expand All @@ -76,7 +76,7 @@ jobs:

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: '1.22'
go-version-file: ./go.mod
check-latest: true

- uses: arduino/setup-task@b91d5d2c96a56797b48ac1e0e89220bf64044611 # v2.0.0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: '1.22'
go-version-file: ./go.mod
check-latest: true
cache: true

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v6
with:
args: --timeout=5m
version: v1.59
version: v1.61.0
devon-manifest marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: '1.22'
go-version-file: ./go.mod
check-latest: true

- name: Login to GitHub Container Registry
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repos:
- id: go-test-mod

- repo: https://github.com/golangci/golangci-lint
rev: v1.59.1
rev: v1.61.0
hooks:
- id: golangci-lint
args: ["--timeout", "10m", "--fix"]
Expand Down
2 changes: 1 addition & 1 deletion cmd/cli/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/protobom/sbom-convert/pkg/format"
)

var outputDirPermissions = 0o755
const outputDirPermissions uint32 = 0o755

func ConvertCommand() *cobra.Command {
co := &options.ConvertOptions{}
Expand Down
2 changes: 2 additions & 0 deletions cmd/cli/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ func validateRootOptions(_ *options.RootOptions) error {
}

func setupLogger(ro *options.RootOptions) error {
//nolint:gosec
// verbose is always within the range of int8
level := zapcore.Level(int(zap.WarnLevel) - ro.Verbose)
log, err := log.NewLogger(
log.WithLevel(level),
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/protobom/sbom-convert

go 1.22.5
go 1.23.1

require (
github.com/google/go-cmp v0.6.0
Expand Down