Skip to content

Commit

Permalink
Merge pull request #486 from praveenrewar/bump-go
Browse files Browse the repository at this point in the history
Bump go, golangci-lint, actions
  • Loading branch information
joaopapereira authored May 17, 2024
2 parents e0d185d + 32341cc commit b6984fc
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 13 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: "1.22.2"
- uses: actions/checkout@v2
go-version: '1.22'
- uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v6
with:
version: v1.54
version: v1.58
args: -v

4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
fetch-depth: 0

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.22.2
go-version: '1.22'

- name: Set up Cosign
uses: sigstore/cosign-installer@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-gh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:
# if set to "true" but frees about 6 GB
tool-cache: true
- name: Set up Go 1.x
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: "1.22.2"
go-version: '1.22'
- name: Check out code into the Go module directory
uses: actions/checkout@v3.3.0
uses: actions/checkout@v4
with:
path: src/github.com/${{ github.repository }}
fetch-depth: 0
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/trivy-scan.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Trivy CVE Dependency Scanner

on:
workflow_dispatch:
schedule:
- cron: '0 0 * * *'

Expand All @@ -10,7 +11,7 @@ jobs:
with:
repo: carvel-dev/kbld
tool: kbld
goVersion: 1.22.2
goVersion: '1.22'
secrets:
githubToken: ${{ secrets.GITHUB_TOKEN }}
slackWebhookURL: ${{ secrets.SLACK_WEBHOOK_URL }}
6 changes: 5 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ linters:
enable:
- goheader
- revive
- deadcode
- unused
disable-all: true
# all available settings of specific linters
Expand All @@ -12,6 +11,11 @@ linters-settings:
regexp:
copyright-year: 20[0-9][0-9]
template-path: code-header-template.txt
revive:
enable-all: true
rules:
- name: dot-imports
disabled: true
issues:
max-issues-per-linter: 0
max-same-issues: 0
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module carvel.dev/kbld

go 1.22
go 1.22.3

require (
carvel.dev/imgpkg v0.42.1
Expand Down

0 comments on commit b6984fc

Please sign in to comment.