Merge 8.6

tcltk · Jul 21, 2021 · c0577a2 · c0577a2
2 parents 379f893 + b0a429c
commit c0577a2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml
@@ -103,20 +103,26 @@ jobs:
     runs-on: windows-latest
     defaults:
       run:
-        shell: bash
+        shell: msys2 {0}
+    env:
+      CC: gcc
+      CFGOPT: --disable-symbols --disable-shared
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
       - name: Install MSYS2
         uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          install: git mingw-w64-x86_64-toolchain make zip
+      - name: Checkout
+        uses: actions/checkout@v2
       - name: Prepare
         run: |
           touch generic/tclStubInit.c generic/tclOOStubInit.c
           echo "VER_PATH=$(cd tools; pwd)/addVerToFile.tcl" >> $GITHUB_ENV
           mkdir 1dist
         working-directory: .
       - name: Configure
-        run: ./configure --disable-symbols --disable-shared --enable-zipfs
+        run: ./configure $CFGOPT
         working-directory: win
       - name: Build
         run: |

diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
@@ -1,5 +1,7 @@
 name: Windows
 on: [push]
+env:
+  ERROR_ON_FAILURES: 1
 jobs:
   msvc:
     runs-on: windows-latest
@@ -40,14 +42,12 @@ jobs:
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
-        env:
-          ERROR_ON_FAILURES: 1
           CI_BUILD_WITH_MSVC: 1
   gcc:
     runs-on: windows-latest
     defaults:
       run:
-        shell: bash
+        shell: msys2 {0}
         working-directory: win
     strategy:
       matrix:
@@ -60,10 +60,13 @@ jobs:
           - "--enable-symbols=mem"
     # 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: Install MSYS2 and Make
-        run: choco install msys2 make
       - name: Prepare
         run: |
           touch tclStubInit.c tclOOStubInit.c tclOOScript.h
@@ -80,8 +83,6 @@ jobs:
         run: make tcltest
       - name: Run Tests
         run: make test
-        env:
-          ERROR_ON_FAILURES: 1
 
 # If you add builds with Wine, be sure to define the environment variable
 # CI_USING_WINE when running them so that broken tests know not to run.