summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-07-16 14:11:41 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-07-16 14:11:41 (GMT)
commit719d29f257750d9a9672a83244bc9e0bf7adfdac (patch)
treee031c64d7aea19b39f316230b64697b37682619f
parent280463dabe0ab7864fb5af6cd1d736c1d69ba98c (diff)
parentb91a3f0f691699de82d3375efce84e7666ac4135 (diff)
downloadtk-719d29f257750d9a9672a83244bc9e0bf7adfdac.zip
tk-719d29f257750d9a9672a83244bc9e0bf7adfdac.tar.gz
tk-719d29f257750d9a9672a83244bc9e0bf7adfdac.tar.bz2
Merge 8.5
-rw-r--r--.github/workflows/win-build.yml7
1 files changed, 3 insertions, 4 deletions
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 8751e11..61a3a74 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,9 @@ jobs:
- "no"
- "mem"
- "all"
- # Using powershell means we need to explicitly stop on failure
steps:
+ - name: Install MSYS2
+ uses: msys2/setup-msys2@v2
- name: Checkout
uses: actions/checkout@v2
- name: Checkout
@@ -105,8 +106,6 @@ jobs:
repository: tcltk/tcl
ref: core-8-6-branch
path: tcl
- - name: Install MSYS2
- uses: msys2/setup-msys2@v2
- name: Prepare
run: |
touch tkStubInit.c