summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Wassberg <jocar@sunet.se>2024-02-19 12:59:35 +0100
committerJohan Wassberg <jocar@sunet.se>2024-02-19 12:59:35 +0100
commit4ebcf0e90df1d9a27b72908395f6691a2ca1c090 (patch)
tree82ef173403dc16a9b7909c9ff7c7ad7340108721
parentb2802ede2ddd57ab2d56e3fe3d449826ef2b963c (diff)
Commit when tagging as we do in other reposfidus-metadata-2024-02-19-v02
-rw-r--r--Makefile5
-rw-r--r--metadata/Makefile6
2 files changed, 10 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f5a6f94..2e7171d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,11 @@
test: mdtest idptest
-tag: test
+tag: commit
./scripts/bump-tag
+commit: test
+ cd metadata ; make commit
+
bootstrap-trust:
./scripts/update-trust
diff --git a/metadata/Makefile b/metadata/Makefile
index 9a7150e..9a81e44 100644
--- a/metadata/Makefile
+++ b/metadata/Makefile
@@ -4,3 +4,9 @@ aggregate-prod:
aggregate-test:
scripts/aggregate.sh fidus-interfederations-test
+
+commit:
+ @git diff --color || true
+ @echo ; echo -n "Run 'git commit -av'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -av ;; s|skip) ;; *) exit 1 ;; esac
+ @git status -u
+ @echo "Checking for files not staged for commit" ; if git status --porcelain --ignored | awk '{print $$2}' | egrep "^production-/|^test-/" | sed 's/^/ /' | grep . ; then echo "There are files not staged for commit, aborting" ; exit 1 ; fi