[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 3c32c43b 2/4: Add 64 bit MinGW CI build
From: |
Vadim Zeitlin |
Subject: |
[lmi-commits] [lmi] master 3c32c43b 2/4: Add 64 bit MinGW CI build |
Date: |
Sat, 12 Feb 2022 19:54:43 -0500 (EST) |
branch: master
commit 3c32c43b1d575f4fcc59eab255572f5d7ceb9c1c
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Vadim Zeitlin <vadim@tt-solutions.com>
Add 64 bit MinGW CI build
---
.github/workflows/ci.yml | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 89447e07..24838a67 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,6 +31,9 @@ jobs:
- name: MSW/make/mingw32
triplet: i686-w64-mingw32
mingw: true
+ - name: MSW/make/mingw64
+ triplet: x86_64-w64-mingw32
+ mingw: true
- name: Linux/make/gcc
- name: Linux/autotools/gcc
autotools: true
@@ -75,14 +78,25 @@ jobs:
if [ ${{ matrix.mingw }} ]
then
- packages="$packages g++-mingw-w64-i686 wine"
-
- # This is additionally required when using 32-bit builds, currently
- # do it unconditionally because our only MinGW build is 32 bits.
- sudo dpkg --add-architecture i386
- sudo apt-get -q -o=Dpkg::Use-Pty=0 update
-
- packages="$packages wine32"
+ case "$LMI_TRIPLET" in
+ i686-*)
+ # This is additionally required when using 32-bit builds for
+ # installing 32 bit Wine which, in turn, is required for
+ # running 32 bit lmi binaries.
+ sudo dpkg --add-architecture i386
+ sudo apt-get -q -o=Dpkg::Use-Pty=0 update
+
+ packages="$packages g++-mingw-w64-i686 wine wine32"
+ ;;
+
+ x86_64-*)
+ packages="$packages g++-mingw-w64-x86-64 wine wine64"
+ ;;
+
+ *)
+ echo 'Unknown MinGW platform.'
+ exit 1
+ esac
else
packages="$packages libgtk-3-dev"
fi