From f04c65b10fe37d1178ba23696121375de6649453 Mon Sep 17 00:00:00 2001
From: Updater <erlend@klakegg.net>
Date: Sat, 9 Nov 2019 10:05:00 +0100
Subject: [PATCH] Adding configuration for upload of assets.

---
 .github/workflows/build.yml | 43 +++++++++++++++++++++++++++++++++++++
 rules/buildconfig.xml       | 12 +++++------
 tools/ehf.makefile          |  3 ++-
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 54f51a2b..711a8b59 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,3 +18,46 @@ jobs:
 
     - name: Build
       run: make
+
+    - name: Package site files
+      run: cd target/site && zip -rq ../../site.zip *
+
+    - 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: "target/validator/no.difi.ehf.postaward-${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/')
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        file: "target/examples.zip"
+        name: "ehf-postaward-g2-examples-${TAG}.zip"
+        label: "Example files"
+
+    - name: Upload Schematron files
+      uses: klakegg/github-upload@v0.9.1
+      if: startsWith(github.ref, 'refs/tags/')
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        file: "target/schematron.zip"
+        name: "ehf-postaward-g2-schematron-${TAG}.zip"
+        label: "Schematron files"
+
+    - name: Upload site files
+      uses: klakegg/github-upload@v0.9.1
+      if: startsWith(github.ref, 'refs/tags/')
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        file: "site.zip"
+        name: "ehf-postaward-g2-site-${TAG}.zip"
+        label: "Site files"
diff --git a/rules/buildconfig.xml b/rules/buildconfig.xml
index 42ed6aa4..a5554448 100644
--- a/rules/buildconfig.xml
+++ b/rules/buildconfig.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <buildConfigurations xmlns="http://difi.no/xsd/vefa/validator/1.0">
 
-    <package url="http://vefa.difi.no/ehf/standard/ehf-catalogue-1.0.14/">EHF Catalogue 1.0.14</package>
-    <package url="http://vefa.difi.no/ehf/standard/ehf-despatch-advice-1.0.11/">EHF Despatch Advice 1.0.11</package>
-    <package url="http://vefa.difi.no/ehf/standard/ehf-invoice-and-creditnote-2.0.16/">EHF Invoice and Creditnote 2.0.16</package>
-    <package url="http://vefa.difi.no/ehf/standard/ehf-order-agreement-1.0.3/">EHF Order Agreement 1.0.3</package>
-    <package url="http://vefa.difi.no/ehf/standard/ehf-ordering-1.0.12/">EHF Ordering 1.0.12</package>
-    <package url="http://vefa.difi.no/ehf/standard/ehf-punch-out-1.0.2/">EHF Punch Out 1.0.2</package>
+    <package url="http://vefa.difi.no/ehf/standard/ehf-catalogue-1.0.15/">EHF Catalogue 1.0.15</package>
+    <package url="http://vefa.difi.no/ehf/standard/ehf-despatch-advice-1.0.12/">EHF Despatch Advice 1.0.12</package>
+    <package url="http://vefa.difi.no/ehf/standard/ehf-invoice-and-creditnote-2.0.17/">EHF Invoice and Creditnote 2.0.17</package>
+    <package url="http://vefa.difi.no/ehf/standard/ehf-order-agreement-1.0.4/">EHF Order Agreement 1.0.4</package>
+    <package url="http://vefa.difi.no/ehf/standard/ehf-ordering-1.0.13/">EHF Ordering 1.0.13</package>
+    <package url="http://vefa.difi.no/ehf/standard/ehf-punch-out-1.0.3/">EHF Punch Out 1.0.3</package>
     <package url="http://vefa.difi.no/ehf/standard/ehf-reminder-1.1.0/">EHF Reminder 1.1.0</package>
 
 </buildConfigurations>
diff --git a/tools/ehf.makefile b/tools/ehf.makefile
index d43f27b2..56d486b4 100644
--- a/tools/ehf.makefile
+++ b/tools/ehf.makefile
@@ -7,6 +7,7 @@ RELEASE := $(if $(RELEASE),$(RELEASE),Unofficial)
 DOCS_FOLDER := $(if $(DOCS_FOLDER),$(DOCS_FOLDER),docs)
 RULES_FOLDER := $(if $(RULES_FOLDER),$(RULES_FOLDER),rules)
 RULES_IDENT := $(if $(RULES_IDENT),$(RULES_IDENT),rules)
+VERSION := $(if $(GITHUB_REF),$(shell echo "$(GITHUB_REF)" | sed "s:.*/::g"),snapshot)
 BUILD = structure example schematron xsd rules docs static
 .DEFAULT_GOAL = default
 define docker_pull
@@ -109,7 +110,7 @@ ifeq "$(RULE_RULES)" "true"
 	$(call docker_run,rules,Running vefa-validator,\
 			-v $(PROJECT):/src \
 			difi/vefa-validator \
-			build -x -t -n $(RULES_IDENT) -a $(RULES_FOLDER) -target target/validator /src)
+			build -x -t -n $(RULES_IDENT) -a $(RULES_FOLDER) -b $(VERSION) -target target/validator /src)
 else
 	$(call skip,rules)
 endif