diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-07-31 15:59:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-07-31 15:59:11 (GMT) |
| commit | e62d47d725beb83ea8d729bfee4677738860cb22 (patch) | |
| tree | befa24b89a6e3b2ec6a0776de9775daea9ba310d | |
| parent | 2002b28cbb4de91f7016656bee1d612fc5ec5301 (diff) | |
| download | tcl-e62d47d725beb83ea8d729bfee4677738860cb22.zip tcl-e62d47d725beb83ea8d729bfee4677738860cb22.tar.gz tcl-e62d47d725beb83ea8d729bfee4677738860cb22.tar.bz2 | |
Backout last 2 commits: It appears that on Windows-2016 the GITHUB-installed version of msys works better than the official msys2
| -rw-r--r-- | .github/workflows/win-build.yml | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 133eabb..637ca7e 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -1,7 +1,5 @@ name: Windows on: [push] -env: - ERROR_ON_FAILURES: 1 jobs: msvc: runs-on: windows-2016 @@ -40,11 +38,13 @@ jobs: if ($lastexitcode -ne 0) { throw "nmake exit code: $lastexitcode" } + env: + ERROR_ON_FAILURES: 1 gcc: runs-on: windows-2016 defaults: run: - shell: msys2 {0} + shell: bash working-directory: win strategy: matrix: @@ -55,14 +55,10 @@ 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 - update: true - 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 @@ -79,3 +75,5 @@ jobs: run: make tcltest - name: Run Tests run: make test + env: + ERROR_ON_FAILURES: 1 |