From 19c735c523def61d149f6c57e034e3d5788410b3 Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Tue, 31 Aug 2021 10:36:04 +0200
Subject: [PATCH] New test

New test

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
---
 .github/workflows/dockcross.yml  | 20 ++------------------
 tools/dockcross-cmake-builder.sh | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100755 tools/dockcross-cmake-builder.sh

diff --git a/.github/workflows/dockcross.yml b/.github/workflows/dockcross.yml
index 465869d..a0606b9 100644
--- a/.github/workflows/dockcross.yml
+++ b/.github/workflows/dockcross.yml
@@ -68,21 +68,5 @@ jobs:
         with:
           submodules: "recursive"
           fetch-depth: 0
-      - name: "Pull ${{ matrix.image_name }}..."
-        run: docker pull dockcross/${{ matrix.image_name }}
-      - name: "Make script"
-        run: |
-          docker run --rm dockcross/${{ matrix.image_name }} > ./dockcross-${{ matrix.image_name }}
-          chmod +x ./dockcross-${{ matrix.image_name }}
-      - name: "Make script"
-        run: |
-              ls
-              pwd
-      - name: "Config CMakefile"
-        run: ./dockcross-${{ matrix.image_name }} cmake -B dockcross-${{ matrix.image_name }} -S . -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-      - name: "Build"
-        run: ./dockcross-${{ matrix.image_name }} ninja -C dockcross-${{ matrix.image_name }}
-      - name: "Test"
-        run: |
-          cd dockcross-${{ matrix.image_name }}
-          ./dockcross-${{ matrix.image_name }} ctest --build-config ${{ matrix.build_type }}
+      - name: "build"
+        run: ./tools/dockcross-cmake-builder.sh ${{ matrix.image_name }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
diff --git a/tools/dockcross-cmake-builder.sh b/tools/dockcross-cmake-builder.sh
new file mode 100755
index 0000000..c96b598
--- /dev/null
+++ b/tools/dockcross-cmake-builder.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+if (( $# >= 1 )); then
+    image=$1
+    build_file=build-${image%:*}
+    shift 1
+
+    cmake_arg=$@
+    echo "cmake arg: $cmake_arg"
+
+    #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" cmake -B "$build_file" -S . -G Ninja $cmake_arg
+    ./dockcross-"$image" ninja -C "$build_file"
+else
+    echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"
+    exit 1
+fi