diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-10-03 17:51:49 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-10-04 11:19:32 +0100 |
| commit | f902d6670f8820bf27939fcca9aa6dcdc12be985 (patch) | |
| tree | 1f2e942de1bf3579f709ee4ea60447ebb0b040c4 | |
| parent | f55cd91992f3817b4c898d6de61b2143d9ee85cb (diff) | |
ci: Teach ci-install.sh to install wine on Debian 9 'stretch'
Signed-off-by: Simon McVittie <smcv@collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=108177
Acked-by: Philip Withnall <withnall@endlessm.com>
(cherry picked from commit 408b222a9fc61327cd7be385b6705f30f0c38802)
| -rwxr-xr-x | tools/ci-install.sh | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/tools/ci-install.sh b/tools/ci-install.sh index 68d1c11b..cd39026b 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -82,12 +82,24 @@ case "$ci_distro" in # travis-ci has a sources list for Chrome which doesn't support i386 : | $sudo tee /etc/apt/sources.list.d/google-chrome.list + case "$ci_suite" in + (trusty) + # Ubuntu 14.04 didn't have the wine32, wine64 packages + wine32=wine:i386 + wine64=wine:amd64 + ;; + (*) + wine32=wine32 + wine64=wine64 + ;; + esac + case "$ci_host" in (i686-w64-mingw32) $sudo dpkg --add-architecture i386 ;; (x86_64-w64-mingw32) - # nothing required, travis-ci is an amd64 system + # assume the host or container is x86_64 already ;; esac @@ -98,14 +110,14 @@ case "$ci_distro" in $sudo apt-get -qq -y install \ binutils-mingw-w64-i686 \ g++-mingw-w64-i686 \ - wine:i386 \ + $wine32 \ ${NULL} ;; (x86_64-w64-mingw32) $sudo apt-get -qq -y install \ binutils-mingw-w64-x86-64\ g++-mingw-w64-x86-64 \ - wine:amd64 \ + $wine64 \ ${NULL} ;; esac |