From 98059d01054ef1f1ce344cd6af5cb84ce191507c Mon Sep 17 00:00:00 2001 From: Erlend Klakegg Bergheim Date: Thu, 29 Oct 2020 06:09:33 +0000 Subject: [PATCH] Prepare for release. --- .github/workflows/build.yml | 10 +++ Makefile | 3 +- project.xml | 6 ++ rules/document-folder-1.0/example/.skip | 0 rules/document-folder-1.0/sch/.skip | 0 rules/qualification-1.0/example/.skip | 0 rules/qualification-1.0/sch/.skip | 0 rules/supplier-list-1.0/example/.skip | 0 rules/supplier-list-1.0/sch/.skip | 0 src/awarded-notification-1.0/example/.skip | 0 src/supplier-list-light-1.0/buildconfig.xml | 6 +- .../docs/guide/snippets/supplierlist.xml | 71 +++++++++---------- .../rules/sch/T14L-SUPPLIER-LIST-1.0.sch | 21 ++++++ .../syntax/docs/participating-party.adoc | 5 ++ .../syntax/docs/reference.adoc | 5 ++ .../syntax/t14l-supplier-list.xml | 19 +++-- tools/ehf.makefile | 16 +---- tools/ehf.sh | 14 +++- 18 files changed, 110 insertions(+), 66 deletions(-) create mode 100644 rules/document-folder-1.0/example/.skip create mode 100644 rules/document-folder-1.0/sch/.skip create mode 100644 rules/qualification-1.0/example/.skip create mode 100644 rules/qualification-1.0/sch/.skip create mode 100644 rules/supplier-list-1.0/example/.skip create mode 100644 rules/supplier-list-1.0/sch/.skip create mode 100644 src/awarded-notification-1.0/example/.skip create mode 100644 src/supplier-list-light-1.0/syntax/docs/participating-party.adoc create mode 100644 src/supplier-list-light-1.0/syntax/docs/reference.adoc diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0904f9..b1a5568 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,6 +60,16 @@ jobs: with: name: target + - name: Upload validation artifact + uses: klakegg/github-upload@v0.9.1 + if: startsWith(github.ref, 'refs/tags/') + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + file: "validator/no.anskaffelser.ehf.preaward.g2-${TAG}.asice" + label: "Validation artifacts for VEFA Validator 2.x" + type: "application/vnd.difi.validator.v2+zip" + - name: Upload examples files uses: klakegg/github-upload@v0.9.1 if: startsWith(github.ref, 'refs/tags/') diff --git a/Makefile b/Makefile index cf34a4c..8a3935d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ #!make IDENTIFIER = ehf-preaward-g2 -RULES_IDENT = no.difi.ehf.preaward.g2 +RULES_IDENT = no.anskaffelser.ehf.preaward.g2 +RELEASE = 2020-10-29 include tools/ehf.makefile diff --git a/project.xml b/project.xml index fd96b98..9672528 100644 --- a/project.xml +++ b/project.xml @@ -182,6 +182,7 @@ dps-qualification document-folder-1.0 supplier-list-1.0 + supplier-list-light-1.0 native:File @@ -194,6 +195,7 @@ dps-qualification document-folder-1.0 supplier-list-1.0 + supplier-list-light-1.0 @@ -267,6 +269,8 @@ Unawarded Notification Process to notify loosing parties in a DPS procurement. --> + + + supplier-list-light-1.0 EHF Supplier List Light 1.0 RC1 diff --git a/rules/document-folder-1.0/example/.skip b/rules/document-folder-1.0/example/.skip new file mode 100644 index 0000000..e69de29 diff --git a/rules/document-folder-1.0/sch/.skip b/rules/document-folder-1.0/sch/.skip new file mode 100644 index 0000000..e69de29 diff --git a/rules/qualification-1.0/example/.skip b/rules/qualification-1.0/example/.skip new file mode 100644 index 0000000..e69de29 diff --git a/rules/qualification-1.0/sch/.skip b/rules/qualification-1.0/sch/.skip new file mode 100644 index 0000000..e69de29 diff --git a/rules/supplier-list-1.0/example/.skip b/rules/supplier-list-1.0/example/.skip new file mode 100644 index 0000000..e69de29 diff --git a/rules/supplier-list-1.0/sch/.skip b/rules/supplier-list-1.0/sch/.skip new file mode 100644 index 0000000..e69de29 diff --git a/src/awarded-notification-1.0/example/.skip b/src/awarded-notification-1.0/example/.skip new file mode 100644 index 0000000..e69de29 diff --git a/src/supplier-list-light-1.0/buildconfig.xml b/src/supplier-list-light-1.0/buildconfig.xml index b7b5cee..c56d7a4 100644 --- a/src/supplier-list-light-1.0/buildconfig.xml +++ b/src/supplier-list-light-1.0/buildconfig.xml @@ -1,18 +1,16 @@ - EHF Supplier List 1.0 RC1 - example docs/guide/snippets rules/unit ehf-preaward-g2-t14l-1.0 - EHF Supplier List 1.0 (Light) + EHF Supplier List Light 1.0 urn:fdc:anskaffelser.no:2019:ehf:schema:ParticipantList-1::ParticipantList ehf-schemas - + \ No newline at end of file diff --git a/src/supplier-list-light-1.0/docs/guide/snippets/supplierlist.xml b/src/supplier-list-light-1.0/docs/guide/snippets/supplierlist.xml index 450c4d9..c6742d6 100644 --- a/src/supplier-list-light-1.0/docs/guide/snippets/supplierlist.xml +++ b/src/supplier-list-light-1.0/docs/guide/snippets/supplierlist.xml @@ -1,44 +1,43 @@ - urn:fdc:anskaffelser.no:2020:ehf:preaward:g2:supplier-list:1.0 - urn:fdc:anskaffelser.no:2020:ehf:preaward:g2:process:light:1.0 + urn:fdc:anskaffelser.no:2020:ehf:preaward:g2:supplier-list:1.0 + urn:fdc:anskaffelser.no:2020:ehf:preaward:g2:process:light:1.0 - 1 - 7c15a808-decc-4382-a0d1-d5ff2c605f1 - 2019-09-09 - 15:00:00 + 1 + 7c15a808-decc-4382-a0d1-d5ff2c605f1 + 2019-09-09 + 15:00:00 - - - - 1458 - - - - - 518 - - - + + + + 1458 + + + + + 518 + + + - - - - - 987654325 - Delta AS - post@delta.no - - Helge Eriksson - +4798765432 - helge.eriksson@delta.no - - - - 01 - - - + + + + 987654325 + Delta AS + post@delta.no + + Helge Eriksson + +4798765432 + helge.eriksson@delta.no + + + + 01 + + + \ No newline at end of file diff --git a/src/supplier-list-light-1.0/rules/sch/T14L-SUPPLIER-LIST-1.0.sch b/src/supplier-list-light-1.0/rules/sch/T14L-SUPPLIER-LIST-1.0.sch index 73c2b7e..7a0f196 100644 --- a/src/supplier-list-light-1.0/rules/sch/T14L-SUPPLIER-LIST-1.0.sch +++ b/src/supplier-list-light-1.0/rules/sch/T14L-SUPPLIER-LIST-1.0.sch @@ -17,6 +17,27 @@ + + + + + + + + + Document MUST not contain empty elements. + + + + Document MUST not contain empty elements. + + + + diff --git a/src/supplier-list-light-1.0/syntax/docs/participating-party.adoc b/src/supplier-list-light-1.0/syntax/docs/participating-party.adoc new file mode 100644 index 0000000..72516e2 --- /dev/null +++ b/src/supplier-list-light-1.0/syntax/docs/participating-party.adoc @@ -0,0 +1,5 @@ +.Example of Participating Party +[source, xml, indent=0] +---- +include::src/supplier-list-light-1.0/docs/guide/snippets/supplierlist.xml[tags=ParticipatingParty] +---- \ No newline at end of file diff --git a/src/supplier-list-light-1.0/syntax/docs/reference.adoc b/src/supplier-list-light-1.0/syntax/docs/reference.adoc new file mode 100644 index 0000000..a819d97 --- /dev/null +++ b/src/supplier-list-light-1.0/syntax/docs/reference.adoc @@ -0,0 +1,5 @@ +.Example of Reference +[source, xml, indent=0] +---- +include::src/supplier-list-light-1.0/docs/guide/snippets/supplierlist.xml[tags=Reference] +---- \ No newline at end of file diff --git a/src/supplier-list-light-1.0/syntax/t14l-supplier-list.xml b/src/supplier-list-light-1.0/syntax/t14l-supplier-list.xml index 09371dc..75d9aaa 100644 --- a/src/supplier-list-light-1.0/syntax/t14l-supplier-list.xml +++ b/src/supplier-list-light-1.0/syntax/t14l-supplier-list.xml @@ -58,7 +58,7 @@ es:FolderReference Folder Reference - structure/docs/supplier-list-1.0/reference.adoc + src/supplier-list-light-1.0/syntax/docs/reference.adoc es:ID @@ -76,20 +76,20 @@ - es:ParticipatingParty Participating Party in DPS - structure/docs/supplier-list-1.0/participating-party.adoc + src/supplier-list-light-1.0/syntax/docs/participating-party.adoc es:Party Party information - + es:CompanyID Company Identifier Company Identifier of the Participating Party in DPS. + EHF-T14L-R011 scheme @@ -100,7 +100,7 @@ 999999995 - + es:Name Name The name of the Participating party in DPS. @@ -111,13 +111,14 @@ es:ElectronicMail Company Email Address post@x-supplier.com + EHF-T14L-R012 es:Contact Contact Person of the Participating Party - + es:Name Contact Name Contact person's name. @@ -129,13 +130,15 @@ Contact Telephone number Contact person's telephone number. +4799663366 + EHF-T14L-R013 - + es:ElectronicMail Contact Email Address Contact person's e-mail address. ola.nordmann@x-supplier.com + EHF-T14L-R012 @@ -148,6 +151,8 @@ es:ID Lot Reference The Dynamic purchase system's Lot Reference number. Only Lot reference is allowed. + EHF-T14L-R001 + EHF-T14L-R002 scheme diff --git a/tools/ehf.makefile b/tools/ehf.makefile index 671e272..bb22d46 100644 --- a/tools/ehf.makefile +++ b/tools/ehf.makefile @@ -10,17 +10,6 @@ RULES_FOLDER := $(if $(RULES_FOLDER),$(RULES_FOLDER),rules) RULES_IDENT := $(if $(RULES_IDENT),$(RULES_IDENT),rules) BUILD = structure example schematron xsd rules docs scripts .DEFAULT_GOAL = default -define docker_pull - @docker pull $(1) -endef -define docker_run - $(call fold_start,$(1),$(2)) - @docker run --rm -i $(3) || touch $(PROJECT)/.failed - @if [ -e $(PROJECT)/.failed ]; then \ - rm $(PROJECT)/.failed; \ - echo "\033[1;31mFailed\033[0m"; \ - fi -endef define fold_start @echo "\033[33;1m$(2)\033[0m" endef @@ -42,9 +31,6 @@ init: serve: $(call fold_start,serve,Serve serve) @ruby -run -e httpd target --bind-address 0.0.0.0 --port 8000 -pull: - $(call fold_start,docker_pull,Pulling Docker images) - $(call docker_pull,$(IMAGE)) env: init $(call fold_start,environment,Creating environment file) @sh tools/ehf.sh trigger_environment @@ -55,7 +41,7 @@ RULE_RULES=$(shell find $(PROJECT) -name buildconfig.xml | wc -l | xargs test "0 rules: init ifeq "$(RULE_RULES)" "true" $(call fold_start,rules,Running vefa-validator) - validator build -x -t -n $(RULES_IDENT) -target target/validator /work + @validator build -x -t -n $(RULES_IDENT) -b $(RELEASE) -target target/validator $(PROJECT) else $(call skip,rules) endif diff --git a/tools/ehf.sh b/tools/ehf.sh index 6ae2003..0d59fb1 100644 --- a/tools/ehf.sh +++ b/tools/ehf.sh @@ -19,18 +19,22 @@ rm -rf target/examples mkdir -p target/examples target/site/files test ! -r tools/template/examples-readme || cat tools/template/examples-readme | envsubst > target/examples/README for folder in $(find rules -mindepth 2 -maxdepth 2 -name example -type d); do +if [ ! -e "$folder/.skip" ]; then mkdir -p target/examples/$(echo $folder | cut -d '/' -f 2) cp -r $folder/* target/examples/$(echo $folder | cut -d '/' -f 2)/ +fi done for folder in $(find src -mindepth 2 -maxdepth 2 -name example -type d); do +if [ ! -e "$folder/.skip" ]; then mkdir -p target/examples/$(echo $folder | cut -d '/' -f 2) cp -r $folder/* target/examples/$(echo $folder | cut -d '/' -f 2)/ +fi done test ! -r tools/script/examples.sh || . tools/script/examples.sh rm -rf target/examples.zip current=$(pwd) cd target/examples -zip -9r ../examples.zip * +zip -D9r ../examples.zip * cp $current/target/examples.zip $current/target/site/files/examples.zip ) trigger_schematron() ( @@ -39,22 +43,26 @@ rm -rf target/schematron mkdir -p target/schematron target/site/files test ! -r tools/template/schematron-readme || cat tools/template/schematron-readme | envsubst > target/schematron/README for sch in $(ls rules/*/sch/*.sch); do +if [ ! -e "$(dirname $sch)/.skip" ]; then echo "Prepare: $sch" mkdir -p target/schematron/$(echo $sch | cut -d '/' -f 2) saxon -s:$sch -xsl:/usr/share/xslt/iso-schematron/iso_dsdl_include.xsl \ | saxon -s:- -xsl:/usr/share/xslt/iso-schematron/iso_abstract_expand.xsl -o:target/schematron/$(echo $sch | cut -d '/' -f 2)/$(basename $sch) +fi done for sch in $(ls src/*/rules/sch/*.sch); do +if [ ! -e "$(dirname $sch)/.skip" ]; then echo "Prepare: $sch" mkdir -p target/schematron/$(echo $sch | cut -d '/' -f 2) saxon -s:$sch -xsl:/usr/share/xslt/iso-schematron/iso_dsdl_include.xsl \ | saxon -s:- -xsl:/usr/share/xslt/iso-schematron/iso_abstract_expand.xsl -o:target/schematron/$(echo $sch | cut -d '/' -f 2)/$(basename $sch) +fi done test ! -r tools/script/schematron.sh || . tools/script/schematron.sh rm -rf target/schematron.zip current=$(pwd) cd target/schematron -zip -9 -r ../schematron.zip * +zip -D9r ../schematron.zip * cp $current/target/schematron.zip $current/target/site/files/schematron.zip ) trigger_xsd() ( @@ -69,7 +77,7 @@ cp -r $folder /tmp/$name cd /tmp/$name test ! -e prepare.sh || . prepare.sh rm -rf prepare.sh -zip -9 -r $current/target/xsd/$name.zip * +zip -D9r $current/target/xsd/$name.zip * cp $current/target/xsd/$name.zip $current/target/site/files/xsd-$name.zip cd $current done