From 6cc47ca4288f2e79c2c6d59c333c4f6ff993cd0e Mon Sep 17 00:00:00 2001
From: Yash Sethiya <yashsethiya97@gmail.com>
Date: Mon, 15 Apr 2024 12:40:06 +0530
Subject: [PATCH] Bump go version to 1.22.2

Signed-off-by: Yash Sethiya <yashsethiya97@gmail.com>
---
 .github/workflows/gh-test-external-registry.yml | 8 ++++++++
 .github/workflows/gh-test.yml                   | 8 ++++++++
 .github/workflows/golangci-lint.yml             | 4 ++++
 .github/workflows/release.yml                   | 4 ++++
 .github/workflows/trivy-scan.yml                | 4 ++++
 go.mod                                          | 2 +-
 6 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gh-test-external-registry.yml b/.github/workflows/gh-test-external-registry.yml
index afad6e4b..dfc310f7 100644
--- a/.github/workflows/gh-test-external-registry.yml
+++ b/.github/workflows/gh-test-external-registry.yml
@@ -26,7 +26,11 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
+<<<<<<< HEAD
         go-version: '1.21.5'
+=======
+        go-version: "1.22.2"
+>>>>>>> 023abd12 (Bump go version to 1.22.2)
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
       with:
@@ -63,7 +67,11 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
+<<<<<<< HEAD
           go-version: '1.21.5'
+=======
+          go-version: "1.22.2"
+>>>>>>> 023abd12 (Bump go version to 1.22.2)
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/gh-test.yml b/.github/workflows/gh-test.yml
index e72265af..9508cf65 100644
--- a/.github/workflows/gh-test.yml
+++ b/.github/workflows/gh-test.yml
@@ -14,7 +14,11 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
+<<<<<<< HEAD
         go-version: "1.21.5"
+=======
+        go-version: "1.22.2"
+>>>>>>> 023abd12 (Bump go version to 1.22.2)
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
       with:
@@ -37,7 +41,11 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
+<<<<<<< HEAD
         go-version: "1.21.5"
+=======
+        go-version: "1.22.2"
+>>>>>>> 023abd12 (Bump go version to 1.22.2)
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
       with:
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index c9f1756a..aee63dba 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -15,7 +15,11 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
+<<<<<<< HEAD
           go-version: "1.21.3"
+=======
+          go-version: "1.22.2"
+>>>>>>> 023abd12 (Bump go version to 1.22.2)
       - uses: actions/checkout@v2
         with:
           fetch-depth: '0'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 57dfc5d0..c4ae7fb6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,7 +18,11 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
+<<<<<<< HEAD
           go-version: 1.21.5
+=======
+          go-version: 1.22.2
+>>>>>>> 023abd12 (Bump go version to 1.22.2)
 
       - name: Retrieve version
         run: |
diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml
index 443d517c..f118b3b1 100644
--- a/.github/workflows/trivy-scan.yml
+++ b/.github/workflows/trivy-scan.yml
@@ -10,7 +10,11 @@ jobs:
     with:
       repo: carvel-dev/imgpkg
       tool: imgpkg
+<<<<<<< HEAD
       goVersion: 1.21.5
+=======
+      goVersion: 1.22.2
+>>>>>>> 023abd12 (Bump go version to 1.22.2)
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
       slackWebhookURL: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/go.mod b/go.mod
index 575dc680..77cbd715 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/carvel-imgpkg
 
-go 1.21
+go 1.22
 
 require (
 	github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220517224237-e6f29200ae04