diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-07-21 08:12:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-07-21 08:12:33 (GMT) |
| commit | 6cc9524fbbe316cd78104df6eb7929ea58c064aa (patch) | |
| tree | f1ce5eb747d20f4b3507fe2e3345995a81c764ca /.github | |
| parent | b1f4ab80a0983f099ba6cf5e690061d36bcc5631 (diff) | |
| parent | edf67bd765d7908902888c07e06683017c3b3ebd (diff) | |
| download | tcl-6cc9524fbbe316cd78104df6eb7929ea58c064aa.zip tcl-6cc9524fbbe316cd78104df6eb7929ea58c064aa.tar.gz tcl-6cc9524fbbe316cd78104df6eb7929ea58c064aa.tar.bz2 | |
Merge 8.6
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/onefiledist.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/win-build.yml | 15 |
2 files changed, 18 insertions, 11 deletions
diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml index b5caa4e..42d0fac 100644 --- a/.github/workflows/onefiledist.yml +++ b/.github/workflows/onefiledist.yml @@ -103,12 +103,18 @@ 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 @@ -116,7 +122,7 @@ jobs: 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 index 7520704..3aa6c27 100644 --- 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. |