From 8cd5f1edcee70592a1a57b9cffafd27ab4144fc1 Mon Sep 17 00:00:00 2001
From: Colin Davidson <colin.davidson@codeplay.com>
Date: Fri, 25 Oct 2024 15:48:11 +0100
Subject: [PATCH] TBD

---
 .github/workflows/planned_testing.yml        | 28 +++++++++++++++-----
 .github/workflows/planned_testing_caller.yml |  5 ++--
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/planned_testing.yml b/.github/workflows/planned_testing.yml
index f90d57a19..9da09b3d7 100644
--- a/.github/workflows/planned_testing.yml
+++ b/.github/workflows/planned_testing.yml
@@ -41,29 +41,43 @@ jobs:
         target_list: ${{ steps.step1.outputs.target_list }}
         os_list: ${{ steps.step1.outputs.os_list }}
     steps:
-      - uses: actions/checkout@v3
       - id: step1
         run: |
-          echo "target_list=$target_list" >> "$GITHUB_OUTPUT"
-          echo "os_list=$os_list" >> "$GITHUB_OUTPUT"        
-          # echo "target_list=${{ inputs.target_list }}" >> "$GITHUB_OUTPUT"
-          # echo "os_list=${{ inputs.os_list }}" >> "$GITHUB_OUTPUT"
+          # echo "target_list=$target_list" >> "$GITHUB_OUTPUT"
+          # echo "os_list=$os_list" >> "$GITHUB_OUTPUT"        
+          echo 'target_list=${{ inputs.target_list }}' >> "$GITHUB_OUTPUT"
+          echo 'os_list=${{ inputs.os_list }}' >> "$GITHUB_OUTPUT"
           cat $GITHUB_OUTPUT
 
   create_ock_artefacts:
     needs: calc_matrix  
     strategy:
       matrix:
-        arch: ${{ fromJson(needs.calc_matrix.outputs.target_list) }}
+        target: ${{ fromJson(needs.calc_matrix.outputs.target_list) }}
         os: ${{ fromJson(needs.calc_matrix.outputs.os_list) }}      
         build_type: [RelAssert]
+        exclude:
+          - os: windows-2019
+            target: aarch64
+          - os: windows-2019
+            target: riscv64
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: Build ock (pretend)
         # if: ${{ contains(inputs.target_linux.matrix.arch,  matrix.arch) }}
         run:
-          echo Running for ${{ matrix.arch }} on os ${{ matrix.os}} input is ${{ inputs.target_linux }})
+          echo Running for ${{ matrix.target }} on os ${{ matrix.os}} > artifact.txt
+
+      - name: 'Upload Artifact'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ock_${{matrix.os}}_${{matrix.target}}
+          path: artifact.txt
+          retention-days: 1
+
+          
+          # input is ${{ inputs.target_list}} and ${{ inputs.os_list }}
 
         # echo "${{ matrix.os }} ${{ matrix.build_type }} ${{ matrix.arch }}" > foo.txt
         
diff --git a/.github/workflows/planned_testing_caller.yml b/.github/workflows/planned_testing_caller.yml
index 844cda43a..58fd7cb4f 100644
--- a/.github/workflows/planned_testing_caller.yml
+++ b/.github/workflows/planned_testing_caller.yml
@@ -14,8 +14,9 @@ jobs:
     if: ${{ github.event_name == 'pull_request' }}    
     uses: ./.github/workflows/planned_testing.yml
     with:
-      target_list: '["x86_64"]'
-      os_list: '["ubuntu-22.04"]'
+      target_list: '["x86_64", "aarch64", "riscv64"]'
+      os_list: '["ubuntu-22.04", "windows-2019"]'
+      # os_list: '["ubuntu-22.04"]'
       # target_host_aarch64_linux: true
 
   # # Could have multiple here