diff --git a/.github/workflows/versions.yaml b/.github/workflows/versions.yaml index 6c5d03077b2aabcdcede7f8da63be4cf3e81d014..6a8f5a253ce3e3467779a9f14c3fde96237f842d 100644 --- a/.github/workflows/versions.yaml +++ b/.github/workflows/versions.yaml @@ -17,13 +17,10 @@ jobs: # Write to temporary file to make update atomic scripts/generate-versions.sh > /tmp/versions.json mv /tmp/versions.json jsonnet/kube-prometheus/versions.json - - name: Install jsonnet bundler - run: | - go get github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb - name: Update jsonnet dependencies run: | - jb update - make --always-make generate + make update + make generate # Reset jsonnetfile.lock.json if no dependencies were updated changedFiles=$(git diff --name-only | grep -v 'jsonnetfile.lock.json') diff --git a/Makefile b/Makefile index 23d3c233d2e084fa75f16341c358ef44054724a0..b252173c8bf9d8a306b3ddb7e938cf9436f91ecc 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,10 @@ vendor: $(JB_BIN) jsonnetfile.json jsonnetfile.lock.json crdschemas: vendor ./scripts/generate-schemas.sh +.PHONY: update +update: $(JB_BIN) + $(JB_BIN) update + .PHONY: validate validate: crdschemas manifests $(KUBECONFORM_BIN) $(KUBECONFORM_BIN) -kubernetes-version $(KUBE_VERSION) -schema-location 'default' -schema-location 'crdschemas/{{ .ResourceKind }}.json' -skip CustomResourceDefinition manifests/