*: add "update" target to makefile and use it in automatic updater

Signed-off-by: paulfantom <pawel@krupa.net.pl>
This commit is contained in:
paulfantom 2021-07-07 10:03:40 +02:00
parent acd7cdcde0
commit ed2ffe9d05
No known key found for this signature in database
GPG Key ID: 12AE0185401674E7
2 changed files with 6 additions and 5 deletions

View File

@ -17,13 +17,10 @@ jobs:
# Write to temporary file to make update atomic # Write to temporary file to make update atomic
scripts/generate-versions.sh > /tmp/versions.json scripts/generate-versions.sh > /tmp/versions.json
mv /tmp/versions.json jsonnet/kube-prometheus/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 - name: Update jsonnet dependencies
run: | run: |
jb update make update
make --always-make generate make generate
# Reset jsonnetfile.lock.json if no dependencies were updated # Reset jsonnetfile.lock.json if no dependencies were updated
changedFiles=$(git diff --name-only | grep -v 'jsonnetfile.lock.json') changedFiles=$(git diff --name-only | grep -v 'jsonnetfile.lock.json')

View File

@ -38,6 +38,10 @@ vendor: $(JB_BIN) jsonnetfile.json jsonnetfile.lock.json
crdschemas: vendor crdschemas: vendor
./scripts/generate-schemas.sh ./scripts/generate-schemas.sh
.PHONY: update
update: $(JB_BIN)
$(JB_BIN) update
.PHONY: validate .PHONY: validate
validate: crdschemas manifests $(KUBECONFORM_BIN) validate: crdschemas manifests $(KUBECONFORM_BIN)
$(KUBECONFORM_BIN) -kubernetes-version $(KUBE_VERSION) -schema-location 'default' -schema-location 'crdschemas/{{ .ResourceKind }}.json' -skip CustomResourceDefinition manifests/ $(KUBECONFORM_BIN) -kubernetes-version $(KUBE_VERSION) -schema-location 'default' -schema-location 'crdschemas/{{ .ResourceKind }}.json' -skip CustomResourceDefinition manifests/