Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
using go/bump instead of go mod -edit
Browse files Browse the repository at this point in the history
pervious pipeline can result in that at some point we downgrade the version because of this command present in the pipeline and we didn't notice.

Signed-off-by: Debasish Biswas <debasishbsws.dev@gmail.com>
debasishbsws authored Dec 14, 2024
1 parent 5265d44 commit 5e87972
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions calico-3.29.yaml
Original file line number Diff line number Diff line change
@@ -66,6 +66,10 @@ pipeline:
repository: https://github.com/projectcalico/calico
tag: v${{package.version}}
expected-commit: ddfc3b1ea724e2580c68d34950f0ccd318ae3ebf
- uses: go/bump
with:
deps: golang.org/x/crypto@v0.31.0
replaces: golang.org/x/crypto=golang.org/x/crypto@v0.31.0
- working-directory: felix
pipeline:
# Equivalent to target: "build-bpf"
@@ -175,11 +179,6 @@ subpackages:
LDFLAGS="$LDFLAGS -X node/buildinfo.BuildDate=$(date -u +'%FT%T%z')"
LDFLAGS="$LDFLAGS -X node/buildinfo.GitRevision=$(git rev-parse HEAD || echo '<unknown>')"
# Mitigate GHSA-v778-237x-gjrc
go mod edit -replace=golang.org/x/crypto=golang.org/x/crypto@v0.31.0
go mod tidy
CGO_ENABLED=1 \
CGO_LDFLAGS="$CGO_LDFLAGS" \
CGO_CFLAGS="$CGO_CFLAGS" \

0 comments on commit 5e87972

Please sign in to comment.