From ed2ffe9d054c4c17b452428e6da8c0c251dd5040 Mon Sep 17 00:00:00 2001
From: paulfantom <pawel@krupa.net.pl>
Date: Wed, 7 Jul 2021 10:03:40 +0200
Subject: [PATCH] *: add "update" target to makefile and use it in automatic
updater
Signed-off-by: paulfantom <pawel@krupa.net.pl>
---
.github/workflows/versions.yaml | 7 ++-----
Makefile | 4 ++++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/versions.yaml b/.github/workflows/versions.yaml
index 6c5d0307..6a8f5a25 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 23d3c233..b252173c 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/
--
GitLab