From ca85f0d73f2d798056c7649419671b2e07499b3a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Sep 2023 11:27:40 -0400
Subject: [PATCH] chore(deps): bump actions/checkout from 3 to 4 (#41)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 0b36a2a2d040afbec47b23af5b23a79b10b2f507)

# Conflicts:
#	.github/workflows/test.yml
---
 .github/workflows/lint.yml    |  4 ++--
 .github/workflows/release.yml |  2 +-
 .github/workflows/test.yml    | 22 +++++++++++++++++++++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 62d5accc..ac023d2f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: 1.20.2
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Lint markdown
         uses: avto-dev/markdown-lint@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7d2358ad..7bf136d4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
       contents: write # for goreleaser/goreleaser-action to create a GitHub release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Go
         uses: actions/setup-go@v4
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 447d79bb..1d1b2530 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version: 1.20.2
@@ -35,6 +35,7 @@ jobs:
         run: |
           make test
 
+<<<<<<< HEAD
   test-integration:
     runs-on: ubuntu-latest
     timeout-minutes: 25
@@ -51,6 +52,25 @@ jobs:
         with:
           go-version: "1.20"
           cache: true
+=======
+  # TODO: Add this back once we have a working version of v0.50.0 with ITS and v0.47.x
+  # test-integration:
+  #   runs-on: ubuntu-latest
+  #   timeout-minutes: 25
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: technote-space/get-diff-action@v6.1.2
+  #       with:
+  #         PATTERNS: |
+  #           **/**.go
+  #           go.mod
+  #           go.sum
+  #     - uses: actions/setup-go@v4
+  #       if: env.GIT_DIFF
+  #       with:
+  #         go-version: "1.20"
+  #         cache: true
+>>>>>>> 0b36a2a (chore(deps): bump actions/checkout from 3 to 4 (#41))
 
       # In this step, this action saves a list of existing images, the cache is
       # created without them in the post run. It also restores the cache if it