From 1bbbba5813cdd2454401bc94b99c6fcf706093f0 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Mon, 22 Nov 2021 16:36:26 +0200
Subject: [PATCH] ci: improve ci_cross.yml

---
 .github/workflows/ci_cross.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci_cross.yml b/.github/workflows/ci_cross.yml
index 21140a0e88..f23a3efd51 100644
--- a/.github/workflows/ci_cross.yml
+++ b/.github/workflows/ci_cross.yml
@@ -19,23 +19,23 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 10
-          
+
       - name: Install dependencies
         run: |
           brew install mingw-w64
           export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/opt/openssl/lib/"
-          
+
       - name: Build V
         run: make
 
       - name: Test symlink
         run: ./v symlink
-        
+
       - name: Cross-compilation to Linux
         run: |
           ./v -os linux cmd/v
           # TODO: fix this: ./v -os linux examples/2048/2048.v
-          
+
       - name: Cross-compilation to Windows
         run: |
           ./v -os windows cmd/v
@@ -52,35 +52,36 @@ jobs:
           fetch-depth: 10
       - name: Install dependencies
         run: |
+          sudo dpkg --add-architecture i386
           sudo apt update
-          sudo apt-get install --quiet -y libssl-dev sqlite3 libsqlite3-dev valgrind
-          sudo apt-get install --quiet -y mingw-w64 wine-stable winetricks
+          sudo apt-get install --quiet -y libssl-dev sqlite3 libsqlite3-dev
+          sudo apt-get install --quiet -y mingw-w64 wine-stable winetricks wine32
       - name: Turn off the wine crash dialog
         run: winetricks nocrashdialog
-        
+
       - name: Build v
         run: make
-        
+
       - name: v.c can be compiled and run with -os cross
         run: |
           ./v -os cross -o /tmp/v.c cmd/v
           gcc  -g -std=gnu11 -I ./thirdparty/stdatomic/nix -w -o v_from_vc /tmp/v.c  -lm -lpthread
           ls -lart v_from_vc
           ./v_from_vc version
-          
+
       - name: v_win.c can be compiled and run with -os windows
         run: |
           ./v -os windows -o /tmp/v_win.c cmd/v
           x86_64-w64-mingw32-gcc -I ./thirdparty/stdatomic/win /tmp/v_win.c -std=c99 -w -municode -o v_from_vc.exe
           ls -lart v_from_vc.exe
           wine v_from_vc.exe version
-          
+
       - name: hello_world.v can be cross compiled to hello_world.exe
         run: |
           ./v -os windows examples/hello_world.v
           ls -lart examples/hello_world.exe
           wine examples/hello_world.exe
-          
+
       - name: 2048.v can be cross compiled to 2048.exe
         run: |
           ./v -os windows examples/2048/2048.v
@@ -104,3 +105,4 @@ jobs:
           .\v.exe -os windows -o v_win.c cmd\v
           dir v2.exe
           dir v_win.c
+          .\v2.exe version