From a34eb865349c1566b37b7a78b1f1f52ba090518e Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Mon, 13 Jan 2025 19:06:11 +0100 Subject: [PATCH 1/2] Bump go.mod and tools/go.mod to go 1.23 Some dependencies depends on will depend on 1.23, and the test-runner image already is up-to-date, so let's use it. Signed-off-by: Vincent Demeester --- go.mod | 4 +--- tools/go.mod | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 7b4c911e2ea..39487928e05 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/tektoncd/pipeline -go 1.22.3 - -toolchain go1.22.7 +go 1.23 require ( github.com/Microsoft/go-winio v0.6.2 // indirect diff --git a/tools/go.mod b/tools/go.mod index d66f670ef7c..d1dc976ccd2 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,8 +1,6 @@ module github.com/tektoncd/pipeline/tools -go 1.22.1 - -toolchain go1.22.5 +go 1.23 require github.com/golangci/golangci-lint v1.63.4 From aa144d5fe32ab487539d56b262968d471dba2f99 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 24 Jan 2025 14:18:52 +0100 Subject: [PATCH 2/2] .github/workflows: update setup-go to use go.mod version Signed-off-by: Vincent Demeester --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/e2e-matrix.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6174e4fac73..08297501fd3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -58,7 +58,7 @@ jobs: - name: Setup go uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5 with: - go-version: '1.22.x' + go-version-file: go.mod # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/e2e-matrix.yml b/.github/workflows/e2e-matrix.yml index 06d6d759500..bf4cf6dbf7e 100644 --- a/.github/workflows/e2e-matrix.yml +++ b/.github/workflows/e2e-matrix.yml @@ -44,15 +44,15 @@ jobs: steps: - name: Check out code onto GOPATH - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: path: ${{ github.workspace }}/src/github.com/tektoncd/pipeline - - name: Set up Go 1.22 - uses: actions/setup-go@v5 + - name: Set up Go (from go.mod) + uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5 with: - go-version: 1.22.5 + go-version-file: ${{ github.workspace }}/src/github.com/tektoncd/pipeline/go.mod - name: Install Dependencies working-directory: ./