Skip to content

Commit f715f50

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 f715f50

File tree

8 files changed

+512
-9
lines changed

8 files changed

+512
-9
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: golangci-lint
4646
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
4747
with:
48-
version: v2.1.6
48+
version: v2.9.0
4949
only-new-issues: true
5050
args: --timeout=10m
5151
- name: yamllint

.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

.github/workflows/e2e-matrix.yml

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
name: Tekton Integration
2+
# Adapted from https://github.com/mattmoor/mink/blob/master/.github/workflows/minkind.yaml
3+
4+
on: [workflow_call]
5+
6+
defaults:
7+
run:
8+
shell: bash
9+
10+
jobs:
11+
e2e-tests:
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ matrix.k8s-name }}-${{ matrix.feature-flags }}-${{ github.event.pull_request.number || github.ref }}
14+
cancel-in-progress: true
15+
name: e2e tests
16+
runs-on: ubuntu-latest
17+
strategy:
18+
fail-fast: false # Keep running if one leg fails.
19+
matrix:
20+
k8s-name:
21+
- k8s-oldest
22+
- k8s-plus-one
23+
24+
include:
25+
- k8s-name: k8s-oldest
26+
k8s-version: v1.28.x
27+
- k8s-name: k8s-plus-one
28+
k8s-version: v1.29.x
29+
env:
30+
KO_DOCKER_REPO: registry.local:5000/tekton
31+
CLUSTER_DOMAIN: c${{ github.run_id }}.local
32+
ARTIFACTS: ${{ github.workspace }}/artifacts
33+
34+
steps:
35+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
36+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
37+
with:
38+
go-version-file: "go.mod"
39+
- uses: ko-build/setup-ko@d006021bd0c28d1ce33a07e7943d48b079944c8d # v0.9
40+
41+
- name: Install Dependencies
42+
working-directory: ./
43+
run: |
44+
echo '::group:: install go-junit-report'
45+
go install github.com/jstemmer/go-junit-report@v0.9.1
46+
echo '::endgroup::'
47+
48+
echo '::group:: created required folders'
49+
mkdir -p "${ARTIFACTS}"
50+
echo '::endgroup::'
51+
52+
echo "${GOPATH}/bin" >> "$GITHUB_PATH"
53+
54+
- name: Run tests
55+
run: |
56+
./hack/setup-kind.sh \
57+
--registry-url $(echo ${KO_DOCKER_REPO} | cut -d'/' -f 1) \
58+
--cluster-suffix c${{ github.run_id }}.local \
59+
--nodes 3 \
60+
--k8s-version ${{ matrix.k8s-version }} \
61+
--e2e-script ./test/e2e-tests.sh \
62+
--e2e-env ./test/e2e-tests-kind-prow.env
63+
64+
- name: Upload test results
65+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
66+
with:
67+
name: ${{ matrix.k8s-version }}-${{ matrix.feature-flags }}
68+
path: ${{ env.ARTIFACTS }}
69+
70+
- uses: chainguard-dev/actions/kind-diag@4ed96e952ef2982fe89a50f3c40e9643bb9fe803 # v1.6.3
71+
if: ${{ failure() }}
72+
with:
73+
artifact-name: ${{ matrix.k8s-version }}-${{ matrix.feature-flags }}-logs
74+
75+
- name: Dump Artifacts
76+
if: ${{ failure() }}
77+
run: |
78+
if [[ -d ${{ env.ARTIFACTS }} ]]; then
79+
cd ${{ env.ARTIFACTS }}
80+
for x in $(find . -type f); do
81+
echo "::group:: artifact $x"
82+
cat $x
83+
echo '::endgroup::'
84+
done
85+
fi

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,10 @@ lint-yaml: ${YAML_FILES} ; $(info $(M) running yamllint…) ## runs yamllint on
118118
@yamllint -c .yamllint $(YAML_FILES)
119119

120120
## Tests
121-
TEST_UNIT_TARGETS := test-unit-verbose test-unit-race
121+
TEST_UNIT_TARGETS := test-unit-verbose test-unit-race test-unit-verbose-and-race
122122
test-unit-verbose: ARGS=-v
123123
test-unit-race: ARGS=-race
124+
test-unit-verbose-and-race: ARGS=-v -race
124125
$(TEST_UNIT_TARGETS): test-unit
125126
.PHONY: $(TEST_UNIT_TARGETS) test-unit
126127
test-unit: ; $(info $(M) running unit tests…) ## Run unit tests

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

hack/update-deps.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,15 @@ fi
5656
go mod tidy
5757
go mod vendor
5858

59+
# github.com/alibabacloud-go/cr-20160607@v1.0.1 ships without a LICENSE file
60+
# at the tagged release, but the source repo is Apache-2.0 licensed.
61+
# Copy from the sibling module which shares the same license.
62+
if [[ -f vendor/github.com/alibabacloud-go/cr-20181201/LICENSE ]] && \
63+
[[ -d vendor/github.com/alibabacloud-go/cr-20160607/client ]]; then
64+
cp vendor/github.com/alibabacloud-go/cr-20181201/LICENSE \
65+
vendor/github.com/alibabacloud-go/cr-20160607/LICENSE
66+
cp vendor/github.com/alibabacloud-go/cr-20181201/LICENSE \
67+
vendor/github.com/alibabacloud-go/cr-20160607/client/LICENSE
68+
fi
69+
5970
update_licenses third_party/VENDOR-LICENSE "./cmd/*"

vendor/github.com/alibabacloud-go/cr-20160607/LICENSE

Lines changed: 201 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)