From b762edc6c78cd5a460c18823f33126ab5702edaf Mon Sep 17 00:00:00 2001
From: Praveen Rewar <8457124+praveenrewar@users.noreply.github.com>
Date: Thu, 16 May 2024 04:58:55 +0530
Subject: [PATCH] Bump go version to v1.22.3

Signed-off-by: Praveen Rewar <8457124+praveenrewar@users.noreply.github.com>
---
 .github/workflows/golangci-lint.yml    | 10 +++++-----
 .github/workflows/release.yml          |  6 +++---
 .github/workflows/test-gh-k8s-1.16.yml |  6 +++---
 .github/workflows/test-gh.yml          |  6 +++---
 .github/workflows/trivy-scan.yml       |  3 ++-
 .golangci.yml                          |  1 -
 go.mod                                 |  4 +---
 7 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index f90c0914d..76ffba277 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v2
+        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.4.0
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.52.2
+          version: v1.58
           args: -v
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 62cc11a05..9d057c621 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,14 +15,14 @@ jobs:
       id-token: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        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-k8s-1.16.yml b/.github/workflows/test-gh-k8s-1.16.yml
index 759a2b5c8..df5e3bde3 100644
--- a/.github/workflows/test-gh-k8s-1.16.yml
+++ b/.github/workflows/test-gh-k8s-1.16.yml
@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v2
+        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@v2
+        uses: actions/checkout@v4
         with:
           path: src/github.com/${{ github.repository }}
           fetch-depth: 0
diff --git a/.github/workflows/test-gh.yml b/.github/workflows/test-gh.yml
index 76326d3a4..8887ac947 100644
--- a/.github/workflows/test-gh.yml
+++ b/.github/workflows/test-gh.yml
@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v2
+      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@v2
+      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 d11e5c1ee..0da208354 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/kapp
       tool: kapp
-      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 a6b6909a1..a80ce113f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -4,7 +4,6 @@ linters:
   enable:
     - goheader
     - revive
-    - deadcode
     - unused
   disable-all: true
 # all available settings of specific linters
diff --git a/go.mod b/go.mod
index cdc98ec10..dd723c251 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module carvel.dev/kapp
 
-go 1.22.0
-
-toolchain go1.22.2
+go 1.22.3
 
 require (
 	github.com/cppforlife/cobrautil v0.0.0-20221130162803-acdfead391ef