diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-07-26 16:17:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-07-26 16:17:47 (GMT) |
| commit | 2dffc3bf07fc870bfe4fb633753735c8112cd316 (patch) | |
| tree | ade751650c2e311c3f3db1b2f3043e69c9333731 /.github | |
| parent | 92cd512f43453b09c541c6df6e4e1144b6b1cc31 (diff) | |
| parent | 6e54652fea55edf721c9889185b4281d8add6836 (diff) | |
| download | tk-2dffc3bf07fc870bfe4fb633753735c8112cd316.zip tk-2dffc3bf07fc870bfe4fb633753735c8112cd316.tar.gz tk-2dffc3bf07fc870bfe4fb633753735c8112cd316.tar.bz2 | |
Merge enhanced-index
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/onefiledist.yml | 9 | ||||
| -rw-r--r-- | .github/workflows/win-build.yml | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml index 37f34b1..70e9379 100644 --- a/.github/workflows/onefiledist.yml +++ b/.github/workflows/onefiledist.yml @@ -153,11 +153,16 @@ jobs: runs-on: windows-latest defaults: run: - shell: bash + shell: msys2 {0} env: CC: gcc CFGOPT: --disable-symbols --disable-shared steps: + - name: Install MSYS2 + uses: msys2/setup-msys2@v2 + with: + msystem: MINGW64 + install: git mingw-w64-x86_64-toolchain make zip - name: Checkout Tk uses: actions/checkout@v2 with: @@ -168,8 +173,6 @@ jobs: repository: tcltk/tcl ref: core-8-branch path: tcl - - name: Install MSYS2, Make, Zip - run: choco install -y msys2 make zip - name: Setup Environment run: | mkdir -p install/combined diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 539b05c..8968f5d 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: @@ -96,6 +96,11 @@ jobs: - "mem" - "all" steps: + - 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: Checkout @@ -104,8 +109,6 @@ jobs: repository: tcltk/tcl ref: core-8-6-branch path: tcl - - name: Install MSYS2, Make, Zip - run: choco install -y msys2 make zip - name: Prepare run: | touch tkStubInit.c |