From a3023c65d63ef58d71a1beb89a0938c474506f65 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Tue, 31 May 2022 10:26:34 +0200 Subject: [PATCH] ci: merge job Matrix-Surelog into Matrix Signed-off-by: Unai Martinez-Corral --- .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 }}