From 173efaf74340915aa3425ebf5ee72fd3de57b5ce Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 24 Jun 2021 10:05:27 +0200
Subject: [PATCH] Analysis workflow, use matrix parameters.

---
 .github/workflows/analysis_ports.yml | 42 ++++++++++++----------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/analysis_ports.yml b/.github/workflows/analysis_ports.yml
index 1c4f46abc..a30b5febb 100644
--- a/.github/workflows/analysis_ports.yml
+++ b/.github/workflows/analysis_ports.yml
@@ -14,17 +14,15 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
-            name: GCC on Linux
-            env:
-              - CONFIG_OPTS: '--enable-debug --disable-flto'
-              - MAKE_TEST: 'yes'
-          - os: ubuntu-latest
-            name: Clang on Linux, clang-analysis
-            env:
-              - CONFIG_OPTS: 'CC=clang --enable-debug --disable-flto'
-              - MAKE_TEST: 'yes'
-              - TEST_ANALYZER: 'yes'
+          - name: GCC on Linux
+            os: ubuntu-latest
+            config: --enable-debug --disable-flto
+            make_test: yes
+          - name: Clang on Linux, clang-analysis
+            os: ubuntu-latest
+            config: "CC=clang --enable-debug --disable-flto"
+            make_test: "yes"
+            clang_analysis: "yes"
  
     steps:
       - uses: actions/checkout@v2
@@ -32,20 +30,16 @@ jobs:
           submodules: false
       - name: checks
         run: |
-          echo $CONFIG_OPTS
-          echo $MAKE_TEST
-          echo $TEST_ANALYZER
+          echo ${{ matrix.config }}
+          echo ${{ matrix.make_test }}
+          echo ${{ matrix.clang_analysis }}
       - name: configure
-        run: ./configure $CONFIG_OPTS
+        run: ./configure ${{ matrix.config }}
       - name: make
         run: make
       - name: make test
-        run: |
-          if [ "$MAKE_TEST" = "yes" ]; then
-            make test
-          fi
-      - name: analyzer
-        run: |
-          if [ "$TEST_ANALYZER" = "yes" ]; then
-            (cd testdata/clang-analysis.tdir; bash clang-analysis.test)
-          fi
+        if: ${{ matrix.make_test == 'yes' }}
+        run: make test
+      - name: clang-analysis
+        if: ${{ matrix.clang_analysis == 'yes' }}
+        run: (cd testdata/clang-analysis.tdir; bash clang-analysis.test)
-- 
2.47.3