From d2873bfda1dabeb7c6a5a36122d2155eb82f0f6c Mon Sep 17 00:00:00 2001
From: PuneetPunamiya <ppunamiy@redhat.com>
Date: Wed, 21 Aug 2024 14:53:02 +0530
Subject: [PATCH] Updates go.mod and github actions to sync with supported
 release versions of pipeline and kubernetes

Signed-off-by: PuneetPunamiya <ppunamiy@redhat.com>
---
 .github/workflows/kind-e2e.yaml | 13 +++++++------
 .github/workflows/lint.yaml     |  3 ++-
 .golangci.yaml                  |  4 ++--
 go.mod                          |  3 ++-
 test/e2e-tests.sh               |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml
index 3b1e27d092..2755741e22 100644
--- a/.github/workflows/kind-e2e.yaml
+++ b/.github/workflows/kind-e2e.yaml
@@ -17,8 +17,8 @@ jobs:
       fail-fast: false # Keep running if one leg fails.
       matrix:
         # Keep in sync with the list of supported releases: https://kubernetes.io/releases/
+        # TODO: add 1.31.x once it is added in https://github.com/sigstore/scaffolding/releases
         k8s-version:
-        - v1.27.x
         - v1.28.x
         - v1.29.x
         - v1.30.x
@@ -31,11 +31,12 @@ jobs:
       fail-fast: false # Keep running if one leg fails.
       matrix:
         pipelines-release:
-        - v0.44.4  # LTS
-        - v0.47.3  # LTS
-        - v0.50.1  # LTS
-        - v0.51.0
+        # This should follow the list of versions from https://github.com/tektoncd/pipeline/blob/main/releases.md#release
+        - v0.50.5  # LTS
+        - v0.53.5  # LTS
+        - v0.56.3  # LTS
+        - v0.59.2  # LTS
     uses: ./.github/workflows/reusable-e2e.yaml
     with:
-      k8s-version: v1.27.x
+      k8s-version: v1.28.x
       pipelines-release: ${{ matrix.pipelines-release }}
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index fd7a604c45..448464591d 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -24,10 +24,11 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
           version: latest
+          args: --new-from-rev=$(git merge-base origin/main HEAD)
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
diff --git a/.golangci.yaml b/.golangci.yaml
index e2ed142b7a..ded2d458f2 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -69,7 +69,7 @@ run:
   issues-exit-code: 1
   build-tags:
     - e2e
-  # skip-dirs:
-  #   - vendor
+  skip-dirs:
+    - vendor
   timeout: 20m
   modules-download-mode: vendor
diff --git a/go.mod b/go.mod
index 016330d3af..799657daf7 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,7 @@
 module github.com/tektoncd/chains
 
-go 1.22
+go 1.22.5
+
 require (
 	cloud.google.com/go/compute/metadata v0.5.0
 	cloud.google.com/go/storage v1.43.0
diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
index bbd0b434c0..b1219489dc 100755
--- a/test/e2e-tests.sh
+++ b/test/e2e-tests.sh
@@ -31,7 +31,7 @@ header "Setting up environment"
 # Test against nightly instead of latest.
 install_tkn
 
-export RELEASE_YAML="https://storage.googleapis.com/tekton-releases/pipeline/previous/v0.59.2/release.yaml"
+export RELEASE_YAML="https://storage.googleapis.com/tekton-releases/pipeline/previous/v0.62.0/release.yaml"
 install_pipeline_crd
 
 install_chains