lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [lmi] master 56186e7 1/4: Remove "mingw: false" definition


From: Vadim Zeitlin
Subject: [lmi-commits] [lmi] master 56186e7 1/4: Remove "mingw: false" definitions from the build matrix
Date: Thu, 13 May 2021 07:34:16 -0400 (EDT)

branch: master
commit 56186e73ebfe7269c40241c64bcd6c277cc84d3e
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Vadim Zeitlin <vadim@tt-solutions.com>

    Remove "mingw: false" definitions from the build matrix
    
    Write conditions in a way that this is the default and is not needed.
    
    No real changes, just a small simplification.
---
 .github/workflows/ci.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 17f43f0..717354b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,13 +32,10 @@ jobs:
             triplet: i686-w64-mingw32
             mingw: true
           - name: Linux/make/gcc
-            mingw: false
           - name: Linux/autotools/gcc
-            mingw: false
             autotools: true
           - name: Linux/autotools/clang
             compiler: clang
-            mingw: false
             autotools: true
     env:
       LMI_COMPILER: ${{ matrix.compiler || 'gcc' }}
@@ -76,7 +73,7 @@ jobs:
             libtool libxml2-utils libxslt1-dev make patch pkg-config rsync \
             shellcheck trang unzip wget xsltproc x11-xserver-utils xvfb zsh"
 
-          if ${{ matrix.mingw }}
+          if [ ${{ matrix.mingw }} ]
           then
             packages="$packages g++-mingw-w64-i686 wine"
 
@@ -117,7 +114,7 @@ jobs:
           sudo sed -i'' -e 's/^int _putenv/_CRTIMP int _putenv/' 
/usr/share/libtool/build-aux/ltmain.sh
 
           echo "coefficiency=--jobs=`nproc`" >> $GITHUB_ENV
-          if ${{ matrix.mingw }}
+          if [ ${{ matrix.mingw }} ]
           then
             compiler=${LMI_TRIPLET}-${LMI_COMPILER}
           else
@@ -165,7 +162,7 @@ jobs:
           $compiler --version
           echo
 
-          if ${{ matrix.mingw }}; then
+          if [ ${{ matrix.mingw }} ]; then
             echo "Wine version:"
             wine --version
             echo



reply via email to

[Prev in Thread] Current Thread [Next in Thread]