cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wine64 for running 64 bit MSW binaries

Browse Source 
Add WINERUN envirionment variable containing the right command to use.
This commit is contained in:
Vadim Zeitlin 2021-06-27 17:30:15 +02:00
parent 0bb6f80a1e
commit 0eca5b6846
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/ci_msw_cross.yml vendored
View File

@ -91,12 +91,14 @@ jobs:
case "${HOST_TRIPLET}" in case "${HOST_TRIPLET}" in
x86_64-w64-mingw32) x86_64-w64-mingw32)
packages="$packages g++-mingw-w64-x86-64 wine64" packages="$packages g++-mingw-w64-x86-64 wine64"
winerun=wine64
;; ;;
i686-w64-mingw32) i686-w64-mingw32)
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo apt-get -q -o=Dpkg::Use-Pty=0 update sudo apt-get -q -o=Dpkg::Use-Pty=0 update
packages="$packages g++-mingw-w64-i686 wine32" packages="$packages g++-mingw-w64-i686 wine32"
winerun=wine
;; ;;
*) *)
@ -107,6 +109,8 @@ jobs:
sudo apt-get -qq install $packages sudo apt-get -qq install $packages
echo "WINERUN=${winerun}" >> $GITHUB_ENV
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
@ -164,7 +168,7 @@ jobs:
httpbin_launch httpbin_launch
wine ./test || rc=$? $WINERUN ./test || rc=$?
if [ -n "$rc" ]; then if [ -n "$rc" ]; then
httpbin_show_log httpbin_show_log
@ -199,4 +203,4 @@ jobs:
sleep 3 sleep 3
done done
echo 'Launching the GUI test:' echo 'Launching the GUI test:'
DISPLAY=:10 wine ./test_gui DISPLAY=:10 $WINERUN ./test_gui