From d39ef12e3b85e18df65c77afb05c0d018ca7640c Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Thu, 26 Aug 2021 17:19:34 +0200
Subject: [PATCH] Fix test

Fix test

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
---
 .github/workflows/main.yml | 22 +++++++++++-----------
 tools/dockcross-command.sh | 23 +++++++++++++++++++++++
 2 files changed, 34 insertions(+), 11 deletions(-)
 create mode 100755 tools/dockcross-command.sh

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 650e78a..95c0b93 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,28 +27,28 @@ jobs:
               stockfish: "yes",
               stockfish_arg: "ARCH=armv7 COMP=ndk",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "android-arm",
             }
           - {
               image: "android-arm64",
               stockfish: "yes",
               stockfish_arg: "ARCH=armv8 COMP=ndk",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "android-arm64",
             }
           - {
               image: "android-x86",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-32 COMP=ndk",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "android-x86",
             }
           - {
               image: "android-x86_64",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64 COMP=ndk",
               openssl: "yes",
-              openssl_arg: "",
+              openssl_arg: "android-x86_64",
             }
           # Linux arm64/armv8 images
           - {
@@ -93,21 +93,21 @@ jobs:
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "linux-armv6",
+              openssl_arg: "linux-armv4",
             }
           - {
               image: "linux-armv6-lts",
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "linux-armv6",
+              openssl_arg: "linux-armv4",
             }
           - {
               image: "linux-armv6-musl",
               stockfish: "no",
               stockfish_arg: "",
               openssl: "yes",
-              openssl_arg: "linux-armv6",
+              openssl_arg: "linux-armv4",
             }
           # Linux armv7 images
           - {
@@ -115,21 +115,21 @@ jobs:
               stockfish: "yes",
               stockfish_arg: "ARCH=armv7",
               openssl: "yes",
-              openssl_arg: "linux-armv7",
+              openssl_arg: "linux-armv4",
             }
           - {
               image: "linux-armv7a",
               stockfish: "yes",
               stockfish_arg: "ARCH=armv7-neon",
               openssl: "yes",
-              openssl_arg: "linux-armv7",
+              openssl_arg: "linux-armv4",
             }
           - {
               image: "linux-armv7l-musl",
               stockfish: "yes",
               stockfish_arg: "ARCH=armv7",
               openssl: "yes",
-              openssl_arg: "linux-armv7",
+              openssl_arg: "linux-armv4",
             }
           # Linux x86 images
           - {
@@ -323,7 +323,7 @@ jobs:
           git clone https://github.com/openssl/openssl.git
           cd openssl
           git checkout openssl-3.0.0-beta2
-          ./Configure ${{ matrix.arch_name.openssl_arg }}
+          ./../tools/dockcross-command.sh ./Configure ${{ matrix.arch_name.openssl_arg }}
           ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2
       - name: deploy
         if: github.ref == 'refs/heads/master'
diff --git a/tools/dockcross-command.sh b/tools/dockcross-command.sh
new file mode 100755
index 0000000..2b44cf0
--- /dev/null
+++ b/tools/dockcross-command.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+if (( $# >= 1 )); then
+    image=$1
+    build_file=build-${image%:*}
+    shift 1
+
+    command=$*
+    echo "command: $command"
+
+    #echo "Pulling dockcross/$image"
+    #docker pull dockcross/"$image"
+
+    echo "Make script dockcross-$image"
+    docker run --rm dockcross/"$image" > ./dockcross-"$image"
+    chmod +x ./dockcross-"$image"
+
+    echo "Build $build_file"
+    ./dockcross-"$image" "$command"
+else
+    echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <command>"
+    exit 1
+fi