Skip to content

Commit 27b4793

Browse files
committed
fix: CVE-2025-61726 - upgrade go version to >1.25.5
Signed-off-by: Shubham Bhardwaj <shubbhar@redhat.com>
1 parent 085896b commit 27b4793

File tree

3 files changed

+21
-28
lines changed

3 files changed

+21
-28
lines changed

.github/workflows/ci.yaml

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
name: ci
22

3-
on: [pull_request] # yamllint disable-line rule:truthy
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- release-*
8+
pull_request:
9+
# The branches below must be a subset of the branches above
10+
branches:
11+
- main
12+
- release-*
413

514
concurrency:
615
group: ${{ github.workflow }}-${{ github.event.pull-request.number || github.ref }}
@@ -52,10 +61,6 @@ jobs:
5261
run: |
5362
apt update && apt install -y yamllint
5463
yamllint -c .yamllint $(find . -path ./vendor -prune -o -type f -regex ".*y[a]ml" -print | tr '\n' ' ')
55-
- name: check-license
56-
run: |
57-
go install github.com/google/go-licenses@v1.0.0
58-
go-licenses check ./...
5964
tests:
6065
needs: [build]
6166
name: test
@@ -68,19 +73,6 @@ jobs:
6873
- name: build
6974
run: |
7075
make test-unit-verbose-and-race
71-
generated:
72-
needs: [build]
73-
name: Check generated code
74-
runs-on: ubuntu-latest
75-
steps:
76-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
77-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
78-
with:
79-
go-version-file: "go.mod"
80-
- name: generated
81-
run: |
82-
go install github.com/google/go-licenses@v1.0.0 # Not sure why it is needed here
83-
./hack/verify-codegen.sh
8476
multi-arch-build:
8577
needs: [build]
8678
name: Multi-arch build
@@ -93,6 +85,3 @@ jobs:
9385
- name: make cross
9486
run: |
9587
make cross
96-
e2e-tests:
97-
needs: [build]
98-
uses: ./.github/workflows/e2e-matrix.yml

.github/workflows/codeql-analysis.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,14 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [main]
16+
branches:
17+
- main
18+
- release-*
1719
pull_request:
1820
# The branches below must be a subset of the branches above
19-
branches: [main]
21+
branches:
22+
- main
23+
- release-*
2024
schedule:
2125
- cron: '30 20 * * 2'
2226

@@ -38,11 +42,11 @@ jobs:
3842

3943
steps:
4044
- name: Checkout repository
41-
uses: actions/checkout@v4
45+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4246

4347
# Initializes the CodeQL tools for scanning.
4448
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v3
49+
uses: github/codeql-action/init@45580472a5bb82c4681c4ac726cfdb60060c2ee1 # v3.32.4
4650
with:
4751
languages: ${{ matrix.language }}
4852
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -51,7 +55,7 @@ jobs:
5155
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5256

5357
# setup cache to speed up the action
54-
- uses: actions/cache@v4
58+
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
5559
with:
5660
path: |
5761
~/.cache/go-build
@@ -81,4 +85,4 @@ jobs:
8185
make bin/tkn
8286
8387
- name: Perform CodeQL Analysis
84-
uses: github/codeql-action/analyze@v3
88+
uses: github/codeql-action/analyze@45580472a5bb82c4681c4ac726cfdb60060c2ee1 # v3.32.4

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/tektoncd/cli
22

3-
go 1.25.0
3+
go 1.25.6
44

55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.7

0 commit comments

Comments
 (0)