diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 476109a8..ecb71337 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f552640d..195d232f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/.github/workflows/test-gh.yml b/.github/workflows/test-gh.yml index b8b787fc..1626f8bb 100644 --- a/.github/workflows/test-gh.yml +++ b/.github/workflows/test-gh.yml @@ -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 diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 14cb8c47..d349c7f9 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -1,6 +1,7 @@ name: Trivy CVE Dependency Scanner on: + workflow_dispatch: schedule: - cron: '0 0 * * *' @@ -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 }} diff --git a/.golangci.yml b/.golangci.yml index 26178c77..33c80545 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -2,7 +2,6 @@ linters: enable: - goheader - revive - - deadcode - unused disable-all: true # all available settings of specific linters @@ -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 diff --git a/go.mod b/go.mod index 707998d6..09695663 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module carvel.dev/kbld -go 1.22 +go 1.22.3 require ( carvel.dev/imgpkg v0.42.1