Skip to content

Commit

Permalink
Revert changes to go/bump
Browse files Browse the repository at this point in the history
Signed-off-by: Philippe Deslauriers <[email protected]>
  • Loading branch information
pdeslaur committed Dec 19, 2023
1 parent 0135f50 commit 9e5396c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 20 deletions.
15 changes: 7 additions & 8 deletions cert-manager-1.12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@ pipeline:
deps: golang.org/x/[email protected]
modroot: .

- uses: go/bump
with:
modroot: cmd/acmesolver

- uses: go/bump
with:
modroot: cmd/cainjector

- uses: go/bump
with:
deps: golang.org/x/[email protected]
Expand All @@ -58,6 +50,13 @@ pipeline:
# the makefile hardcodes the requirement for some container runtime (CTR), even when we don't need it
# to workaround, set CTR to anything $(command -v)able
- runs: |
# This is needed because the go bumps above affect these packages
for mod in cainjector acmesolver; do
cd cmd/$mod
go mod tidy
cd ../..
done
make CTR=make _bin/server/controller-linux-$(go env GOARCH)
make CTR=make _bin/server/webhook-linux-$(go env GOARCH)
make CTR=make _bin/server/cainjector-linux-$(go env GOARCH)
Expand Down
15 changes: 7 additions & 8 deletions cert-manager-1.13.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@ pipeline:
deps: golang.org/x/[email protected]
modroot: .

- uses: go/bump
with:
modroot: cmd/acmesolver

- uses: go/bump
with:
modroot: cmd/cainjector

- uses: go/bump
with:
deps: golang.org/x/[email protected]
Expand All @@ -58,6 +50,13 @@ pipeline:
# the makefile hardcodes the requirement for some container runtime (CTR), even when we don't need it
# to workaround, set CTR to anything $(command -v)able
- runs: |
# This is needed because the go bumps above affect these packages
for mod in cainjector acmesolver; do
cd cmd/$mod
go mod tidy
cd ../..
done
make CTR=make _bin/server/controller-linux-$(go env GOARCH)
make CTR=make _bin/server/webhook-linux-$(go env GOARCH)
make CTR=make _bin/server/cainjector-linux-$(go env GOARCH)
Expand Down
6 changes: 2 additions & 4 deletions pipelines/go/bump.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ needs:
inputs:
deps:
description: The deps to bump, space separated
default: ""
required: true
modroot:
description: The root of the module
default: .
Expand All @@ -26,9 +26,7 @@ pipeline:
cd "${{inputs.modroot}}"
go mod tidy -go=${{inputs.go-version}}
if [ ! -z "${{inputs.deps}}" ]; then
gobump -packages "${{inputs.deps}}" -replaces "${{inputs.replaces}}"
fi
gobump -packages "${{inputs.deps}}" -replaces "${{inputs.replaces}}"
go mod tidy -go=${{inputs.go-version}}
if [ -d "./vendor" ]; then
Expand Down

0 comments on commit 9e5396c

Please sign in to comment.