diff --git a/cert-manager-1.12.yaml b/cert-manager-1.12.yaml index 45ecbee63e2..6521c8b2eec 100644 --- a/cert-manager-1.12.yaml +++ b/cert-manager-1.12.yaml @@ -32,14 +32,6 @@ pipeline: deps: golang.org/x/crypto@v0.17.0 modroot: . - - uses: go/bump - with: - modroot: cmd/acmesolver - - - uses: go/bump - with: - modroot: cmd/cainjector - - uses: go/bump with: deps: golang.org/x/crypto@v0.17.0 @@ -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) diff --git a/cert-manager-1.13.yaml b/cert-manager-1.13.yaml index 82ba2c91cd0..6ebf2226015 100644 --- a/cert-manager-1.13.yaml +++ b/cert-manager-1.13.yaml @@ -32,14 +32,6 @@ pipeline: deps: golang.org/x/crypto@v0.17.0 modroot: . - - uses: go/bump - with: - modroot: cmd/acmesolver - - - uses: go/bump - with: - modroot: cmd/cainjector - - uses: go/bump with: deps: golang.org/x/crypto@v0.17.0 @@ -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) diff --git a/pipelines/go/bump.yaml b/pipelines/go/bump.yaml index ce777b5492e..cabc1479c1f 100644 --- a/pipelines/go/bump.yaml +++ b/pipelines/go/bump.yaml @@ -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: . @@ -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