3 files changed, 22 insertions, 21 deletions
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 77d5849..9414037 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
     - "main"
+    - "core-8-branch"
     - "core-8-6-branch"
     tags:
     - "core-**"
@@ -22,14 +23,12 @@ jobs:
         compiler:
           - "gcc"
           - "clang"
-        symbols:
-          - "no"
-          - "mem"
-        disables:
+        config:
           - ""
           - "--disable-shared"
           - "--disable-xft"
           - "--disable-xss"
+          - "--enable-symbols"
     steps:
       - name: Checkout Tk
         uses: actions/checkout@v4
@@ -52,10 +51,10 @@ jobs:
           echo "BUILD_CONFIG_ID=$OPTS" >> $GITHUB_ENV
         working-directory: "."
         env:
-          CFGOPT: --enable-symbols=${{ matrix.symbols }} ${{ matrix.disables }}
+          CFGOPT: ${{ matrix.config }}
           COMPILER: ${{ matrix.compiler }}
-          OPTS: ${{ matrix.compiler }}-${{ matrix.symbols }}${{ matrix.disables }}
-      - name: Configure (symbols=${{ matrix.symbols }} opts=${{ matrix.disables }})
+          OPTS: ${{ matrix.compiler }}${{ matrix.config }}
+      - name: Configure (opts=${{ matrix.config }})
         run: |
           ./configure $CFGOPT "--prefix=$HOME/install dir" || {
             cat config.log
@@ -93,12 +92,12 @@ jobs:
             exit 1
           }
       - name: Discover Version ID
-        if: ${{ env.BUILD_CONFIG_ID == 'gcc-no' }}
+        if: ${{ env.BUILD_CONFIG_ID == 'gcc' }}
         run: |
           cd /tmp/dist
           echo "VERSION=`ls -d tk* | sed 's/tk//'`" >> $GITHUB_ENV
       - name: Upload Source Distribution
-        if: ${{ env.BUILD_CONFIG_ID == 'gcc-no' }}
+        if: ${{ env.BUILD_CONFIG_ID == 'gcc' }}
         uses: actions/upload-artifact@v4
         with:
           name: Tk ${{ env.VERSION }} Source distribution (snapshot)
@@ -106,7 +105,7 @@ jobs:
             /tmp/dist/tk*
             !/tmp/dist/tk*/html/**
       - name: Upload Documentation Distribution
-        if: ${{ env.BUILD_CONFIG_ID == 'gcc-no' }}
+        if: ${{ env.BUILD_CONFIG_ID == 'gcc' }}
         uses: actions/upload-artifact@v4
         with:
           name: Tk ${{ env.VERSION }} HTML documentation (snapshot)
@@ -117,9 +116,10 @@ jobs:
       matrix:
         compiler:
           - "gcc"
-        symbols:
-          - "no"
-          - "mem"
+        config:
+          - ""
+          - "--disable-xft"
+          - "--enable-symbols"
     steps:
       - name: Checkout Tk
         uses: actions/checkout@v4
@@ -134,9 +134,9 @@ jobs:
           echo "CC=$COMPILER" >> $GITHUB_ENV
         working-directory: "."
         env:
-          CFGOPT: --enable-symbols=${{ matrix.symbols }}
+          CFGOPT: ${{ matrix.config }}
           COMPILER: ${{ matrix.compiler }}
-      - name: Configure (symbols=${{ matrix.symbols }})
+      - name: Configure ${{ matrix.config }}
         run: |
           ./configure $CFGOPT "--prefix=$HOME/install dir" || {
             cat config.log
@@ -161,4 +161,4 @@ jobs:
             echo "::error::Failure during Test"
             exit 1
           }
-        timeout-minutes: 15
+        timeout-minutes: 10
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index 70af86d..9fd297a 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
     - "main"
+    - "core-8-branch"
     - "core-8-6-branch"
     tags:
     - "core-**"
@@ -96,7 +97,7 @@ jobs:
       - name: Build Tcl
         # Note that macOS is always a 64 bit platform
         run: |
-          ./configure --enable-64bit ${CFGOPT} "--prefix=$HOME/install dir" || {
+          ./configure --enable-64bit $CFGOPT "--prefix=$HOME/install dir" || {
             cat config.log
             echo "::error::Failure during Tcl Configure"
             exit 1
@@ -115,7 +116,7 @@ jobs:
       - name: Configure (symbols=${{ matrix.symbols }} ${{matrix.options }})
         # Note that macOS is always a 64 bit platform
         run: |
-          ./configure --enable-64bit ${CFGOPT} "--prefix=$HOME/install dir" --disable-xft || {
+          ./configure --enable-64bit $CFGOPT "--prefix=$HOME/install dir" --disable-xft || {
             cat config.log
             echo "::error::Failure during Configure"
             exit 1
@@ -161,7 +162,7 @@ jobs:
             echo "::error::Failure in ttk test results"
             exit 1
           }
-        timeout-minutes: 15
+        timeout-minutes: 20
       - name: Carry out trial installation
         run: |
           make install || {
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 6e399be..a0af658 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -87,7 +87,7 @@ jobs:
         env:
           CI_BUILD_WITH_MSVC: 1
         shell: bash
-        timeout-minutes: 15
+        timeout-minutes: 10
       - name: Build Help (${{ matrix.config }})
         run: |
           &nmake -f makefile.vc htmlhelp ${{ matrix.config }}
@@ -176,4 +176,4 @@ jobs:
             echo "::error::Failure during Test"
             exit 1
           }
-        timeout-minutes: 15
+        timeout-minutes: 10