From eff08da703a7f85e7c2c34ee624d0b6ae0cea947 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Sun, 15 Nov 2020 15:48:43 +0000
Subject: Rethinking how to do a build matrix on several platforms

---
 .github/workflows/linux-build.yml | 10 +++++++++-
 .github/workflows/mac-build.yml   | 14 ++++++++++----
 .github/workflows/win-build.yml   |  9 ++++++---
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index a2b2a64..a4fd7b3 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -3,6 +3,12 @@ on: [push]
 jobs:
   gcc:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        symbols:
+          - "no"
+          - "mem"
+          - "all"
     defaults:
       run:
         shell: bash
@@ -10,10 +16,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Configure
+      - name: Configure (symbols=${{ matrix.symbols }})
         run: |
           mkdir "${HOME}/install dir"
           ./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
+        env:
+          CFGOPT: --enable-symbols=${{ matrix.symbols }}
       - name: Prepare
         run: touch tclStubInit.c tclOOStubInit.c
         working-directory: generic
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index bd45c89..c78f882 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -24,7 +24,12 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        config_options: [ "--enable-dtrace", "--enable-debug=mem" ]
+        symbols:
+          - "no"
+          - "mem"
+        dtrace:
+          - "no"
+          - "yes"
     defaults:
       run:
         shell: bash
@@ -37,10 +42,11 @@ jobs:
           touch tclStubInit.c tclOOStubInit.c
           mkdir "$HOME/install dir"
         working-directory: generic
-      - name: Configure
-        run: ./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
+      - name: Configure (symbols=${{ matrix.symbols }} dtrace=${{ matrix.dtrace }})
+        # Note that macOS is always a 64 bit platform
+        run: ./configure --enable-64bit ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
         env:
-          CFGOPT: ${{ matrix.config_options }}
+          CFGOPT: --enable-symbols=${{ matrix.symbols }} --enable-dtrace=${{ matrix.dtrace }}
       - name: Build
         run: |
           make all tcltest
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 22d40be..e938609 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -41,7 +41,10 @@ jobs:
         working-directory: win
     strategy:
       matrix:
-        config_options: [ "--disable-debug", "--enable-debug=mem" ]
+        symbols:
+          - "no"
+          - "mem"
+          - "all"
     # Using powershell means we need to explicitly stop on failure
     steps:
       - name: Checkout
@@ -53,11 +56,11 @@ jobs:
           touch tclStubInit.c tclOOStubInit.c
           mkdir "${HOME}/install dir"
         working-directory: generic
-      - name: Configure
+      - name: Configure (symbols=${{ matrix.symbols }})
         run: |
           ./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
         env:
-          CFGOPT: --enable-64bit ${{ matrix.config_options }}
+          CFGOPT: --enable-64bit --enable-symbols=${{ matrix.symbols }}
       - name: Build
         run: make all
       - name: Build Test Harness
-- 
cgit v0.12