[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 95c9f72 08/28: Use Debian Wine version in CI
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 95c9f72 08/28: Use Debian Wine version in CI job |
Date: |
Wed, 12 May 2021 18:14:43 -0400 (EDT) |
branch: master
commit 95c9f723cc0fe32e7899bffebe078ac14452329a
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Use Debian Wine version in CI job
Prefer using the Debian version instead of the one from WineHQ for
consistency with the local environments.
---
.github/workflows/ci.yml | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e33ad99..4d76c62 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,7 +68,14 @@ jobs:
if ${{ matrix.mingw }}
then
- packages="$packages g++-mingw-w64-i686"
+ 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"
else
packages="$packages libunwind-dev libdw-dev libgtk-3-dev"
fi
@@ -84,22 +91,6 @@ jobs:
with:
submodules: 'recursive'
- - name: Install Wine
- if: matrix.mingw
- run: |
- sudo dpkg --add-architecture i386
-
- wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo
apt-key add -
- sudo add-apt-repository "deb
https://dl.winehq.org/wine-builds/debian $(lsb_release -cs) main"
-
- sudo apt-get -qq update
-
- # Workaround the issue with Wine.
- sudo apt-get -qq install libasound2-plugins:i386 libgphoto2-6:i386
- sudo apt-get -qq install wine-stable-i386
- sudo apt-get -qq install wine-stable
- sudo apt-get -qq install --install-recommends winehq-stable
-
- name: System and environment setup
run: |
sudo sed -i'' -e 's/^int _putenv/_CRTIMP int _putenv/'
/usr/share/libtool/build-aux/ltmain.sh
- [lmi-commits] [lmi] master 521017e 05/28: Show environment and compiler information in the CI output, (continued)
- [lmi-commits] [lmi] master 521017e 05/28: Show environment and compiler information in the CI output, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master e94f977 15/28: Run CI job steps as non-root container user, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master 2213a23 22/28: Disable clang deprecated declarations warnings in uBLAS headers, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master 7e32f37 02/28: Don't build Boost.Filesystem library in the CI builds any more, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master 0713a8f 14/28: Don't put NORMAL_UID in the environment unnecessarily, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master aa750df 12/28: Work around global_settings_test failure in autotools builds, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master 0d89ef3 07/28: Install sudo without using sudo, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master 2814dec 11/28: Check for comparison operator defaulting in configure C++ test, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master e5160fe 20/28: Revert "Add workaround for Boost.Regex compilation with clang 11", Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master d09dfce 17/28: Merge lmi directories creation step with the system setup one, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master 95c9f72 08/28: Use Debian Wine version in CI job,
Greg Chicares <=
- [lmi-commits] [lmi] master 4a1c735 19/28: Rename CI job and build names for brevity and consistency, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master e46db7c 21/28: Work around std::allocator::size_type problem in clang 11 libc++, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master 4a09a23 09/28: Work around JRE installation problem in Debian slim container, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master 21706da 25/28: Fix expression_template_0_test compilation with clang 12, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master c4a85fc 06/28: Install the required packages before checkout in the CI job, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master 5d5054f 18/28: Use correct permissions for the Git checkout, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master 3a89381 24/28: Create /tmp/.X11-unix directory before running Xvfb, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master 5c2b93a 23/28: Install x11-xserver-utils package to get xset, Greg Chicares, 2021/05/12
- [lmi-commits] [lmi] master 2be5478 27/28: Preserve NUL characters in fs::path::string(), Greg Chicares, 2021/05/12