diff --git a/.conform.yaml b/.conform.yaml index 1477b8e232..2afcd0b5bb 100644 --- a/.conform.yaml +++ b/.conform.yaml @@ -44,6 +44,7 @@ policies: - deps - e2e - export + - gmpctl - main - operator - prometheus diff --git a/ops/gmpctl/lib.sh b/ops/gmpctl/lib.sh index 3e0d4bdaeb..1462e6e5e0 100755 --- a/ops/gmpctl/lib.sh +++ b/ops/gmpctl/lib.sh @@ -442,17 +442,7 @@ release-lib::manifests_regen() { return 1 fi - # TODO(bwplotka): Manage deps better. It's getting confusing what bins we should use (worktree bingo? script bingo?). - go install helm.sh/helm/v3/cmd/helm@latest - go install github.com/google/addlicense@latest - go install github.com/mikefarah/yq/v4@latest - - # Hack: Do the bingo variable swap. This allows injecting our own. - # This is faster than running requiring bingo and running bingo get. - cp "${dir}/.bingo/variables.env" "${dir}/.bingo/variables.env.bak" - echo "#!/bin/bash" >"${dir}/.bingo/variables.env" # Clean the file. - YQ="$(which yq)" HELM="$(which helm)" ADDLICENSE="$(which addlicense)" bash "${dir}/hack/presubmit.sh" manifests - cp "${dir}/.bingo/variables.env.bak" "${dir}/.bingo/variables.env" + bash "${dir}/hack/presubmit.sh" manifests echo "✅ Manifests regenerated" return 0