Merge 8.6bug-b1d115fa60

5 files changed, 38 insertions, 20 deletions

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..35a56fb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,3 @@
+Important Note
+==========
+Please do not file issues with Tk on Github. They are unlikely to be noticed in a timely fashion. Tk issues are hosted in the [tk fossil repository on core.tcl-lang.org](https://core.tcl-lang.org/tk/tktnew); please post them there.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..dc07555
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,3 @@
+Important Note
+==========
+Please do not file pull requests with Tk on Github. They are unlikely to be noticed in a timely fashion. Tk issues (including patches) are hosted in the [tk fossil repository on core.tcl-lang.org](https://core.tcl-lang.org/tk/tktnew); please post them there.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 70bbd5e..ce382a1 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -93,7 +93,7 @@ jobs:
         if: ${{ env.BUILD_CONFIG_ID == 'gcc-no' }}
         uses: actions/upload-artifact@v2
         with:
-          name: Tk ${{ env.VERSION }} Source distribution (unofficial)
+          name: Tk ${{ env.VERSION }} Source distribution (snapshot)
           path: |
             /tmp/dist/tk*
             !/tmp/dist/tk*/html/**
@@ -101,7 +101,7 @@ jobs:
         if: ${{ env.BUILD_CONFIG_ID == 'gcc-no' }}
         uses: actions/upload-artifact@v2
         with:
-          name: Tk ${{ env.VERSION }} HTML documentation (unofficial)
+          name: Tk ${{ env.VERSION }} HTML documentation (snapshot)
           path: /tmp/dist/tk*/html
   test:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index ae0ec24..2600858 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -4,7 +4,7 @@ env:
   ERROR_ON_FAILURES: 1
 jobs:
   xcode:
-    runs-on: macos-11.0
+    runs-on: macos-11
     defaults:
       run:
         shell: bash
@@ -37,8 +37,17 @@ jobs:
             echo "::error::Failure during Build"
             exit 1
           }
+      - name: Run Tests
+        run: |
+          make test | tee out.txt
+          nmatches=$( grep -c "Failed	0" out.txt )
+          if [ $nmatches -lt 4 ]
+          then
+            echo "::error::Failure during Test"
+            exit 1
+          fi
   clang:
-    runs-on: macos-11.0
+    runs-on: macos-11
     strategy:
       matrix:
         symbols:
@@ -63,18 +72,17 @@ jobs:
           ref: core-8-6-branch
           path: tcl
       - name: Prepare checked out repositories
+        env:
+          SET_DISPLAY: ${{ contains(matrix.options, '--disable-aqua') }}
         run: |
           touch ../generic/tkStubInit.c ../doc/man.macros
           mkdir "$HOME/install dir"
           echo "USE_XVFB=$SET_DISPLAY" >> $GITHUB_ENV
-        env:
-          SET_DISPLAY: ${{ contains(matrix.options, '--disable-aqua') }}
       - name: Add X11 (if required)
-        if: ${{ env.USE_XVFB }}
-        # This involves black magic
+        if: ${{ env.USE_XVFB == 'true' }}
         run: |
           brew install --cask xquartz
-          sudo /opt/X11/lib/X11/xinit/privileged_startx.d/10-tmpdirs || true
+          sudo /opt/X11/libexec/privileged_startx || true
         working-directory: .
       - name: Build Tcl
         # Note that macOS is always a 64 bit platform
@@ -125,23 +133,25 @@ jobs:
             }
           else
             function runXvfb {
-              : do nothing
+              echo Xvfb not used, this is a --enable-aqua build
             }
           fi
           ( runXvfb :0; make test-classic; exit $? ) | tee out-classic.txt || {
-            echo "::error::Failure during Test"
+            echo "::error::Failure during Test (classic)"
             exit 1
           }
           ( runXvfb :0; make test-ttk; exit $? ) | tee out-ttk.txt || {
-            echo "::error::Failure during Test"
+            echo "::error::Failure during Test (ttk)"
             exit 1
           }
-          cat out-classic.txt out-ttk.txt | grep -q "Failed[[:space:]][[:space:]]*[1-9]" && {
-            echo "::error::Failure during Test"
+          cat out-classic.txt | grep -q "Failed	0" || {
+            echo "::error::Failure in classic test results"
+            exit 1
+          }
+          cat out-ttk.txt | grep -q "Failed	0" || {
+            echo "::error::Failure in ttk test results"
             exit 1
           }
-        env:
-          MAC_CI: 1
       - name: Carry out trial installation
         run: |
           make install || {
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 2f0b328..70de8f8 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -87,7 +87,7 @@ jobs:
     runs-on: windows-2019
     defaults:
       run:
-        shell: bash
+        shell: msys2 {0}
         working-directory: win
     strategy:
       matrix:
@@ -95,8 +95,12 @@ jobs:
           - "no"
           - "mem"
           - "all"
-    # Using powershell means we need to explicitly stop on failure
     steps:
+      - name: Install MSYS2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          install: git mingw-w64-x86_64-toolchain make
       - name: Checkout
         uses: actions/checkout@v2
       - name: Checkout
@@ -105,8 +109,6 @@ jobs:
           repository: tcltk/tcl
           ref: core-8-6-branch
           path: tcl
-      - name: Install MSYS2, Make
-        run: choco install -y msys2 make
       - name: Prepare
         run: |
           touch tkStubInit.c