From 960471b4a3c0f7cff09892ac41885ad5b7959731 Mon Sep 17 00:00:00 2001
From: nickevansuk <2616208+nickevansuk@users.noreply.github.com>
Date: Wed, 20 Mar 2024 13:56:02 +0000
Subject: [PATCH] Include in test in CI

---
 .github/workflows/validate-new-dataset.yml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/validate-new-dataset.yml b/.github/workflows/validate-new-dataset.yml
index 825d70d..01cc18c 100644
--- a/.github/workflows/validate-new-dataset.yml
+++ b/.github/workflows/validate-new-dataset.yml
@@ -26,30 +26,37 @@ jobs:
         ref: master
         path: old
      
-    - name: Get new Dataset Site URL from PR
+    - name: Get new Dataset Site URL from PR (for singular.jsonld)
       uses: openactive/data-catalog-compare-action@main
       id: dataset
       with:
         new_json_file: './new/singular.jsonld'
         old_json_file: './old/singular.jsonld'
 
-    - name: Get new Dataset Site URL from PR
+    - name: Get new Dataset Site URL from PR (for singular-preview.jsonld)
       uses: openactive/data-catalog-compare-action@main
       id: dataset-preview
       with:
         new_json_file: './new/singular-preview.jsonld'
         old_json_file: './old/singular-preview.jsonld'
         
+    - name: Get new Dataset Site URL from PR (for singular-test.jsonld)
+      uses: openactive/data-catalog-compare-action@main
+      id: dataset-test
+      with:
+        new_json_file: './new/singular-test.jsonld'
+        old_json_file: './old/singular-test.jsonld'
+
     - name: Checkout OpenActive Test Suite
       uses: actions/checkout@v2
-      if: ${{ steps.dataset.outputs.url || steps.dataset-preview.outputs.url }}
+      if: ${{ steps.dataset.outputs.url || steps.dataset-preview.outputs.url || steps.dataset-test.outputs.url }}
       with:
         repository: openactive/openactive-test-suite
         path: tests
 
     - name: Install OpenActive Test Suite
       run: npm install
-      if: ${{ steps.dataset.outputs.url || steps.dataset-preview.outputs.url}}
+      if: ${{ steps.dataset.outputs.url || steps.dataset-preview.outputs.url || steps.dataset-test.outputs.url }}
       working-directory: tests
 
     - name: Install
@@ -59,8 +66,8 @@ jobs:
       run: npm test
 
     - name: Validate new dataset
-      run: npm run validate-feeds ${{ steps.dataset.outputs.url || steps.dataset-preview.outputs.url}}
-      if: ${{ steps.dataset.outputs.url || steps.dataset-preview.outputs.url }}
+      run: npm run validate-feeds ${{ steps.dataset.outputs.url || steps.dataset-preview.outputs.url || steps.dataset-test.outputs.url }}
+      if: ${{ steps.dataset.outputs.url || steps.dataset-preview.outputs.url || steps.dataset-test.outputs.url }}
       env:
         FORCE_COLOR: 1
         NODE_CONFIG: |
@@ -69,7 +76,7 @@ jobs:
       
     - name: Upload validation results as artifact upon failure
       uses: actions/upload-artifact@v2
-      if: ${{ failure() && (steps.dataset.outputs.url || steps.dataset-preview.outputs.url) }}
+      if: ${{ failure() && (steps.dataset.outputs.url || steps.dataset-preview.outputs.url || steps.dataset-test.outputs.url) }}
       with:
         name: validation-results
         path: ./tests/results/