From 50ffb7468690b4a82f9a207e76b00ff03866005b Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <vvaintroub@gmail.com>
Date: Mon, 31 Jul 2023 19:03:55 +0200
Subject: [PATCH] update mingw.yml

---
 .github/workflows/mingw.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index 4cc210ed..4f2fa8e4 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -1,14 +1,14 @@
-name: minGW-CMake
+name: gcc-ninja-CMake
 on: [push, pull_request]
 
 jobs:
   build:
     strategy:
       matrix:
-        os: [windows-latest]
-        mysql-version: [mysql-8.0, mariadb-10.6, mariadb-10.11, mariadb-11.1]
+        os: [windows-latest, ubuntu-latest]
+        mysql-version: [mysql-8.0, mariadb-11.1]
     runs-on: ${{ matrix.os }}
-    name: Test with ${{ matrix.mysql-version }}
+    name: Test with ${{ matrix.mysql-version }} on ${{ matrix.os }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -16,15 +16,19 @@ jobs:
         run: cmake . -GNinja -DCMAKE_C_COMPILER=gcc
       - name: Build
         run: cmake --build .
-      - name: Sysbench version
-        run: .\src\sysbench.exe --version
-      - name: Sysbench help
-        run: .\src\sysbench.exe --help
       - name: test_install
         run: |
           cmake --install . --prefix install_dir
+      - name: update environment (Windows only)
+        if: contains(matrix.os, 'windows')
+        run: |
           echo "$pwd\install_dir\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           cat $env:GITHUB_PATH
+      - name: update environment (non-Windows)
+        if: contains(matrix.os, 'ubuntu')
+        run: |
+            echo "$PWD/install_dir/bin" >> $GITHUB_PATH
+            cat $GITHUB_PATH
       - name: actions-setup-mysql
         uses: shogo82148/actions-setup-mysql@v1
         with:
@@ -34,7 +38,7 @@ jobs:
             innodb_buffer_pool_size=512MB
             max_allowed_packet=16MB
             skip-log-bin
-            enable-named-pipe
+            loose-enable-named-pipe
             socket=MySQL
             max_connections=1000
       - name: create database sbtest