Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-07-21 17:22:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source 
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
Bensuperpc
2021-08-05 17:33:52 +02:00
parent 356a6e98a2 9adf96c16b
commit 60c9ba0b79
14 changed files with 790 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View File

@@ -53,7 +53,11 @@ jobs:
max-parallel: 4
# manylinux2014-aarch64 cc65 pvsneslib
matrix:
<<<<<<< HEAD
arch_name: [linux-armv8, android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-armv8-musl, linux-armv8-rpi3, linux-armv5, linux-armv5-musl, linux-armv6-rpi1, linux-armv7-rpi2, linux-armv6-musl, linux-armv6-rpi-old, linux-armv7, linux-armv7l-musl, linux-mips, linux-mips64, linux-mips64el-n64, linux-mipsel, linux-m68k, linux-ppc32, linux-ppc64, linux-s390x, linux-x64, linux-x64-clang, linux-x86, linux-riscv64, manylinux2014-x64, manylinux2014-x86, windows-static-x64, linux-armv7a, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, linux-armv8-rpi4, windows-shared-x86]
=======
arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-s390x, linux-x64, linux-x86, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86]
>>>>>>> 9adf96c16b00759a9f7f69be3e61b5e16cdd6ac4
steps:
- uses: actions/checkout@v2
- uses: actions/download-artifact@v2