Merge 8.6

3 files changed, 14 insertions, 13 deletions

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index a4fd7b3..a7b62dd 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -1,14 +1,15 @@
-name: Linux Build and Test
+name: Linux
 on: [push]
 jobs:
   gcc:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        symbols:
-          - "no"
-          - "mem"
-          - "all"
+        cfgopt:
+          - ""
+          - "--disable-shared"
+          - "--enable-symbols"
+          - "--enable-symbols=mem"
     defaults:
       run:
         shell: bash
@@ -16,15 +17,15 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Configure (symbols=${{ matrix.symbols }})
+      - name: Prepare
+        run: touch tclStubInit.c tclOOStubInit.c
+        working-directory: generic
+      - name: Configure ${{ matrix.cfgopt }}
         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
+          CFGOPT: ${{ matrix.cfgopt }}
       - name: Build
         run: |
           make all
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index c78f882..2c95399 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -1,4 +1,4 @@
-name: macOS Build and Test
+name: macOS
 on: [push]
 jobs:
   with-Xcode:
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 9c3d76c..a7906cd 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -1,4 +1,4 @@
-name: Windows Build and Test
+name: Windows
 on: [push]
 jobs:
   MSVC: