diff options
| author | Björn Mattsson <bjorn@sunet.se> | 2024-04-15 13:21:35 +0200 |
|---|---|---|
| committer | Björn Mattsson <bjorn@sunet.se> | 2024-04-15 13:21:35 +0200 |
| commit | 73aa018559ce8a8c7147a14610c3f3bf663426d4 (patch) | |
| tree | c40c1102553e07d7c82f87a7af6ba72e7d981e28 | |
| parent | e0bd36eccf080ca706d804cc879c0749a05b3c1d (diff) | |
| parent | b2d13ccd33ef1fc9fa973dfd59d1dfe093797630 (diff) | |
Merge branch 'master' of git.swamid.se:fidus-metadata
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | metadata/Makefile | 6 | ||||
| -rw-r--r-- | metadata/production-sp/skolverket.eduid.se-dnp-sp-.xml (renamed from metadata/production-sp/skolverket.eduid.se-dnp-sp.xml) | 0 | ||||
| -rwxr-xr-x | scripts/bump-tag | 3 |
4 files changed, 13 insertions, 5 deletions
@@ -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 @@ -31,11 +34,11 @@ mdtest: idptest: @if (grep -rq IDPSSODescriptor metadata/*-sp); then echo "Hittade en IDP band SP:na !!!"; exit 1; fi - + update: update-git ./scripts/verify-tag && ./scripts/update-trust && rsync -avz --exclude fidus-interfederations-prod/*.xml --exclude fidus-interfederations-prod/last_aggregate.ts --exclude fidus-interfederations-test/*.xml --exclude fidus-interfederations-test/last_aggregate.ts --delete metadata/ /opt/metadata/ update-git: - git checkout master && git reset --hard && git pull + git checkout master && git reset --hard && git pull 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 diff --git a/metadata/production-sp/skolverket.eduid.se-dnp-sp.xml b/metadata/production-sp/skolverket.eduid.se-dnp-sp-.xml index 4379ea9..4379ea9 100644 --- a/metadata/production-sp/skolverket.eduid.se-dnp-sp.xml +++ b/metadata/production-sp/skolverket.eduid.se-dnp-sp-.xml diff --git a/scripts/bump-tag b/scripts/bump-tag index af4ee40..317dd31 100755 --- a/scripts/bump-tag +++ b/scripts/bump-tag @@ -6,8 +6,7 @@ test -f .env && . ./.env git pull -deftag=`basename $PWD` -tagpfx=${tag:="$deftag"} +tagpfx=${tag:="fidus-metadata"} last_tag=`git tag -l "${tagpfx}-*"|sort|tail -1` |