From 64f1ccefbbee55767857f202c952b5ba92ab5efb Mon Sep 17 00:00:00 2001
From: Sam Gamble <hexadessa@gmail.com>
Date: Fri, 12 Jul 2024 15:25:01 +0100
Subject: [PATCH] first pass, try new scripts in CI

---
 .github/workflows/build.yml | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4d3d410b..aabda0ce 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,9 +19,11 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       oed_json_spec: ${{ steps.build_result.outputs.oed_json_spec }}
+      oed_excel_spec: ${{ steps.build_result.outputs.oed_excel_spec }}
     env:
-      SPEC_PATH_IN: './OpenExposureData/Docs/OpenExposureData_Spec.xlsx'
-      SPEC_PATH_OUT: './ods_tools/data/OpenExposureData_Spec.json'
+      SPEC_PATH_IN: './OpenExposureData/OpenExposureData'
+      JSON_PATH_OUT: './ods_tools/data/OpenExposureData_Spec.json'
+      EXCEL_PATH_OUT: './ods_tools/data/OpenExposureData_Spec.xlsx'
 
     steps:
     - name: Github context
@@ -49,19 +51,32 @@ jobs:
         python-version: 3.9
     - run: pip install pip-tools pandas pyarrow openpyxl click tox
 
-    - name: Extract Spec
-      run: |
-        ./docker/extract_spec.py json\
-            --source-excel-path ${{ env.SPEC_PATH_IN }} \
-            --output-json-path ${{ env.SPEC_PATH_OUT }}
+    - name: Create JSON spec
+      run: ./utils/gen-json.py
+            --source-csv-dir ${{ env.SPEC_PATH_IN }} \
+            --output-path ${{ env.JSON_PATH_OUT }}
+
+    - name: Create JSON spec
+      run: ./utils/gen-excel.py
+            --source-csv-dir ${{ env.SPEC_PATH_IN }} \
+            --output-path ${{ env.EXCEL_PATH_OUT }}
 
-    - name: Store spec
+    - name: store json spec
       uses: actions/upload-artifact@v3
       with:
         name: extracted_spec
-        path: ${{ env.SPEC_PATH_OUT }}
+        path: ${{ env.json_path_out }}
+        retention-days: 5
+
+    - name: store excel spec
+      uses: actions/upload-artifact@v3
+      with:
+        name: excel_spec
+        path: ${{ env.excel_path_out }}
         retention-days: 5
 
     - name: Build output
       id: build_result
-      run: echo "oed_json_spec=OpenExposureData_Spec.json" >> $GITHUB_OUTPUT
+      run: |
+        echo "oed_json_spec=OpenExposureData_Spec.json" >> $GITHUB_OUTPUT
+        echo "oed_excel_spec=OpenExposureData_Spec.xlsx" >> $GITHUB_OUTPUT