From 52cc54ce6f4258e4349c93d95c1ce111d26f8a7d Mon Sep 17 00:00:00 2001 From: Lars Kanis Date: Wed, 23 Jun 2021 10:17:52 +0200 Subject: [PATCH] CI: Enable MINGW-UCRT build and test in github actions This enables a temporary branch on ruby/setup-ruby and MSP-Greg/setup-ruby-pkgs for UCRT-capable action setup. They set correct PATH and MINGW_PACKAGE_PREFIX for UCRT, if a UCRT based ruby is used. See here for more details: https://github.com/ruby/setup-ruby/issues/193 To enable correct UCRT settings this therefore uses rubyinstaller-head as base ruby, since it is already UCRT based. --- .github/workflows/mingw.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 8f5a8e657f..d98f532cd7 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -8,8 +8,7 @@ jobs: make: runs-on: windows-2019 env: - MSYSTEM: MINGW64 - MSYSTEM_PREFIX: /mingw64 + MSYSTEM: ${{ matrix.msystem }} MSYS2_ARCH: x86_64 CHOST: "x86_64-w64-mingw32" CFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe -fstack-protector-strong" @@ -20,7 +19,13 @@ jobs: GITPULLOPTIONS: --no-tags origin ${{github.ref}} strategy: matrix: - test_task: [ "check" ] # to make job names consistent + include: + - msystem: "MINGW64" + base_ruby: 2.6 + test_task: [ "check" ] # to make job names consistent + - msystem: "UCRT64" + base_ruby: head + test_task: [ "check" ] # to make job names consistent fail-fast: false steps: - run: mkdir build @@ -35,10 +40,11 @@ jobs: with: path: src - name: Set up Ruby & MSYS2 - uses: MSP-Greg/setup-ruby-pkgs@v1 + uses: MSP-Greg/setup-ruby-pkgs@ucrt with: - ruby-version: 2.6 - mingw: _upgrade_ gmp libffi libyaml openssl ragel readline + ruby-version: ${{ matrix.base_ruby }} + setup-ruby-ref: MSP-Greg/ruby-setup-ruby/00-win-ucrt + mingw: _upgrade_ gmp libffi libyaml openssl ragel readline gcc msys2: automake1.16 bison - name: where check run: |