mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-23 09:04:27 +01:00
Fix test
Fix test Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
parent
f2fa6d69ca
commit
d39ef12e3b
22
.github/workflows/main.yml
vendored
22
.github/workflows/main.yml
vendored
@ -27,28 +27,28 @@ jobs:
|
|||||||
stockfish: "yes",
|
stockfish: "yes",
|
||||||
stockfish_arg: "ARCH=armv7 COMP=ndk",
|
stockfish_arg: "ARCH=armv7 COMP=ndk",
|
||||||
openssl: "yes",
|
openssl: "yes",
|
||||||
openssl_arg: "",
|
openssl_arg: "android-arm",
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
image: "android-arm64",
|
image: "android-arm64",
|
||||||
stockfish: "yes",
|
stockfish: "yes",
|
||||||
stockfish_arg: "ARCH=armv8 COMP=ndk",
|
stockfish_arg: "ARCH=armv8 COMP=ndk",
|
||||||
openssl: "yes",
|
openssl: "yes",
|
||||||
openssl_arg: "",
|
openssl_arg: "android-arm64",
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
image: "android-x86",
|
image: "android-x86",
|
||||||
stockfish: "yes",
|
stockfish: "yes",
|
||||||
stockfish_arg: "ARCH=x86-32 COMP=ndk",
|
stockfish_arg: "ARCH=x86-32 COMP=ndk",
|
||||||
openssl: "yes",
|
openssl: "yes",
|
||||||
openssl_arg: "",
|
openssl_arg: "android-x86",
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
image: "android-x86_64",
|
image: "android-x86_64",
|
||||||
stockfish: "yes",
|
stockfish: "yes",
|
||||||
stockfish_arg: "ARCH=x86-64 COMP=ndk",
|
stockfish_arg: "ARCH=x86-64 COMP=ndk",
|
||||||
openssl: "yes",
|
openssl: "yes",
|
||||||
openssl_arg: "",
|
openssl_arg: "android-x86_64",
|
||||||
}
|
}
|
||||||
# Linux arm64/armv8 images
|
# Linux arm64/armv8 images
|
||||||
- {
|
- {
|
||||||
@ -93,21 +93,21 @@ jobs:
|
|||||||
stockfish: "no",
|
stockfish: "no",
|
||||||
stockfish_arg: "",
|
stockfish_arg: "",
|
||||||
openssl: "yes",
|
openssl: "yes",
|
||||||
openssl_arg: "linux-armv6",
|
openssl_arg: "linux-armv4",
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
image: "linux-armv6-lts",
|
image: "linux-armv6-lts",
|
||||||
stockfish: "no",
|
stockfish: "no",
|
||||||
stockfish_arg: "",
|
stockfish_arg: "",
|
||||||
openssl: "yes",
|
openssl: "yes",
|
||||||
openssl_arg: "linux-armv6",
|
openssl_arg: "linux-armv4",
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
image: "linux-armv6-musl",
|
image: "linux-armv6-musl",
|
||||||
stockfish: "no",
|
stockfish: "no",
|
||||||
stockfish_arg: "",
|
stockfish_arg: "",
|
||||||
openssl: "yes",
|
openssl: "yes",
|
||||||
openssl_arg: "linux-armv6",
|
openssl_arg: "linux-armv4",
|
||||||
}
|
}
|
||||||
# Linux armv7 images
|
# Linux armv7 images
|
||||||
- {
|
- {
|
||||||
@ -115,21 +115,21 @@ jobs:
|
|||||||
stockfish: "yes",
|
stockfish: "yes",
|
||||||
stockfish_arg: "ARCH=armv7",
|
stockfish_arg: "ARCH=armv7",
|
||||||
openssl: "yes",
|
openssl: "yes",
|
||||||
openssl_arg: "linux-armv7",
|
openssl_arg: "linux-armv4",
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
image: "linux-armv7a",
|
image: "linux-armv7a",
|
||||||
stockfish: "yes",
|
stockfish: "yes",
|
||||||
stockfish_arg: "ARCH=armv7-neon",
|
stockfish_arg: "ARCH=armv7-neon",
|
||||||
openssl: "yes",
|
openssl: "yes",
|
||||||
openssl_arg: "linux-armv7",
|
openssl_arg: "linux-armv4",
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
image: "linux-armv7l-musl",
|
image: "linux-armv7l-musl",
|
||||||
stockfish: "yes",
|
stockfish: "yes",
|
||||||
stockfish_arg: "ARCH=armv7",
|
stockfish_arg: "ARCH=armv7",
|
||||||
openssl: "yes",
|
openssl: "yes",
|
||||||
openssl_arg: "linux-armv7",
|
openssl_arg: "linux-armv4",
|
||||||
}
|
}
|
||||||
# Linux x86 images
|
# Linux x86 images
|
||||||
- {
|
- {
|
||||||
@ -323,7 +323,7 @@ jobs:
|
|||||||
git clone https://github.com/openssl/openssl.git
|
git clone https://github.com/openssl/openssl.git
|
||||||
cd openssl
|
cd openssl
|
||||||
git checkout openssl-3.0.0-beta2
|
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
|
./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2
|
||||||
- name: deploy
|
- name: deploy
|
||||||
if: github.ref == 'refs/heads/master'
|
if: github.ref == 'refs/heads/master'
|
||||||
|
23
tools/dockcross-command.sh
Executable file
23
tools/dockcross-command.sh
Executable file
@ -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
|
Loading…
Reference in New Issue
Block a user