From a3023c65d63ef58d71a1beb89a0938c474506f65 Mon Sep 17 00:00:00 2001
From: Unai Martinez-Corral <umartinezcorral@antmicro.com>
Date: Tue, 31 May 2022 10:26:34 +0200
Subject: [PATCH 1/2] ci: merge job Matrix-Surelog into Matrix

Signed-off-by: Unai Martinez-Corral <umartinezcorral@antmicro.com>
---
 .github/workflows/sphinx-tuttest.yml | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/sphinx-tuttest.yml b/.github/workflows/sphinx-tuttest.yml
index f98ca93..93ec4a5 100644
--- a/.github/workflows/sphinx-tuttest.yml
+++ b/.github/workflows/sphinx-tuttest.yml
@@ -10,6 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.generate.outputs.matrix }}
+      surelog-matrix: ${{ steps.generate-surelog.outputs.matrix }}
 
     steps:
 
@@ -20,6 +21,10 @@ jobs:
         id: generate
         run: ./.github/scripts/generate_job_matrix.py '${{ github.repository }}'
 
+      - name: Generate examples matrix
+        id: generate-surelog
+        run: ./.github/scripts/generate_job_matrix.py '${{ github.repository }}' Surelog
+
 
   Test:
     needs: Matrix
@@ -75,26 +80,13 @@ jobs:
             **/*.bit
             **/plot_*.svg
 
-  Matrix-Surelog:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.generate.outputs.matrix }}
-
-    steps:
-
-      - name: Setup repository
-        uses: actions/checkout@v3
-
-      - name: Generate examples matrix
-        id: generate
-        run: ./.github/scripts/generate_job_matrix.py '${{ github.repository }}' Surelog
 
   Test-Surelog:
-    needs: Matrix-Surelog
+    needs: Matrix
     strategy:
       fail-fast: false
       matrix:
-        include: ${{ fromJson(needs.Matrix-Surelog.outputs.matrix) }}
+        include: ${{ fromJson(needs.Matrix.outputs.surelog-matrix) }}
     runs-on: ${{ matrix.runs-on }}
     name: Surelog frontend - ${{ matrix.fpga-fam }} | ${{ matrix.os }} ${{ matrix.os-version }} | ${{ matrix.example }}
 

From fe5f069ee67067e4a0d4b9f9a87b5c31fcb2c01a Mon Sep 17 00:00:00 2001
From: Unai Martinez-Corral <umartinezcorral@antmicro.com>
Date: Tue, 31 May 2022 10:28:01 +0200
Subject: [PATCH 2/2] ci: save bitstreams and plots to separated artifacts

Signed-off-by: Unai Martinez-Corral <umartinezcorral@antmicro.com>
---
 .github/workflows/sphinx-tuttest.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/sphinx-tuttest.yml b/.github/workflows/sphinx-tuttest.yml
index 93ec4a5..5968cae 100644
--- a/.github/workflows/sphinx-tuttest.yml
+++ b/.github/workflows/sphinx-tuttest.yml
@@ -76,9 +76,12 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: f4pga-examples-bitstreams
-          path: |
-            **/*.bit
-            **/plot_*.svg
+          path: '**/*.bit'
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: f4pga-examples-plots
+          path: '**/plot_*.svg'
 
 
   Test-Surelog:
@@ -130,6 +133,9 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: f4pga-examples-bitstreams-systemverilog-plugin
-          path: |
-            **/*.bit
-            **/plot_*.svg
+          path: '**/*.bit'
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: f4pga-examples-plots-systemverilog-plugin
+          path: '**/plot_*.svg'