From 29c168300f8abf7d789e4d8de414ecc51ccb784c Mon Sep 17 00:00:00 2001
From: divyansh42 <diagrawa@redhat.com>
Date: Fri, 24 Apr 2026 12:50:17 +0530
Subject: [PATCH 1/3] Update OWNERS file for release-v0.37.6 branch

Signed-off-by: divyansh42 <diagrawa@redhat.com>
---
 OWNERS | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/OWNERS b/OWNERS
index 1fe35bdc35..22afbd7518 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,13 +1,19 @@
 # The OWNERS file is used by prow to automatically merge approved PRs.
 
 approvers:
+- divyansh42
 - vdemeester
 - chmouel
-- piyush-garg
-- pradeepitm12
 - vinamra28
+- pratap0007
+
+reviewers:
+- pratap0007
+- divyansh42
+- pradeepitm12
 
 # Alumni ❤️
 # danielhelfand
 # hrishin
 # sthaha
+# piyush-garg

From 2098c49d50aed5e68a181f86a961990e954cb239 Mon Sep 17 00:00:00 2001
From: divyansh42 <diagrawa@redhat.com>
Date: Wed, 22 Apr 2026 12:30:56 +0530
Subject: [PATCH 2/3] Add CI summary job to the github workflows

Signed-off-by: divyansh42 <diagrawa@redhat.com>
---
 .github/workflows/ci.yaml | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a7d19a1ff0..89660710cb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -97,3 +97,39 @@ jobs:
   e2e-tests:
     needs: [build]
     uses: ./.github/workflows/e2e-matrix.yml
+
+  ci-summary:
+    name: CI summary
+    if: always()
+    needs:
+      - build
+      - linting
+      - tests
+      - generated
+      - multi-arch-build
+      - e2e-tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check job results
+        run: |
+          echo "build: ${{ needs.build.result }}"
+          echo "linting: ${{ needs.linting.result }}"
+          echo "tests: ${{ needs.tests.result }}"
+          echo "generated: ${{ needs.generated.result }}"
+          echo "multi-arch-build: ${{ needs.multi-arch-build.result }}"
+          echo "e2e-tests: ${{ needs.e2e-tests.result }}"
+          results=(
+            "${{ needs.build.result }}"
+            "${{ needs.linting.result }}"
+            "${{ needs.tests.result }}"
+            "${{ needs.generated.result }}"
+            "${{ needs.multi-arch-build.result }}"
+            "${{ needs.e2e-tests.result }}"
+          )
+          for result in "${results[@]}"; do
+            if [[ "$result" != "success" && "$result" != "skipped" ]]; then
+              echo "One or more jobs failed"
+              exit 1
+            fi
+          done
+          echo "All jobs passed or were skipped"

From 91dd8ecf7abc710fff2854e9128df5f87e161aa3 Mon Sep 17 00:00:00 2001
From: Shubham Bhardwaj <shubbhar@redhat.com>
Date: Mon, 13 Apr 2026 17:50:53 +0530
Subject: [PATCH 3/3] fix: CVE-2025-61729 - update contrib Dockerfile to use Go
 1.25.6

Signed-off-by: Shubham Bhardwaj <shubbhar@redhat.com>
---
 contrib/tkn-image/Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/tkn-image/Dockerfile b/contrib/tkn-image/Dockerfile
index a6112e720b..0ee6707810 100644
--- a/contrib/tkn-image/Dockerfile
+++ b/contrib/tkn-image/Dockerfile
@@ -1,11 +1,11 @@
-ARG GOLANG_VERSION=1.17.13
-ARG DEBIAN_VERSION=10
+ARG GOLANG_VERSION=1.25.6
+ARG DEBIAN_VERSION=12
 
-FROM golang:${GOLANG_VERSION} as builder
+FROM golang:${GOLANG_VERSION} AS builder
 ARG RELEASE_VERSION=
 COPY . /go/src/github.com/tektoncd/cli
 WORKDIR /go/src/github.com/tektoncd/cli
 RUN make RELEASE_VERSION=${RELEASE_VERSION} bin/tkn
 
-FROM debian:${DEBIAN_VERSION} as tkn
+FROM debian:${DEBIAN_VERSION} AS tkn
 COPY --from=builder /go/src/github.com/tektoncd/cli/bin/tkn /usr/bin