Compare commits

..

13 Commits

Author SHA1 Message Date
e8a4d76049 Merge branch 'master' into update_label 2021-10-13 14:22:36 +02:00
c994e33650 Merge pull request #617 from bensuperpc/update_tests
Update and fix CPython tests
2021-10-13 14:08:58 +02:00
b44144d865 Merge pull request #618 from bensuperpc/update_isl
Change ISL mirror with new official source
2021-10-13 14:08:44 +02:00
17a2266499 Merge pull request #616 from sabelka/nsis-installer
add nsis installer for windows images
2021-10-12 14:00:08 -04:00
122a1586ef Merge pull request #615 from sabelka/fix-tmp-wine
clean up temporary files left over from wine
2021-10-12 13:59:40 -04:00
8dbeadbf6c Fix ARM64 full
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-10-12 09:54:13 +02:00
1f024a67f4 Update main.yml 2021-10-12 01:11:47 +02:00
e8f7b68794 Update main.yml 2021-10-11 20:56:49 +02:00
73897d848b Update main.yml 2021-10-11 20:47:17 +02:00
cb783b06c2 Update main.yml 2021-10-11 20:43:58 +02:00
c03a167b3f Update main.yml 2021-10-11 17:25:09 +02:00
a036aca087 add nsis installer for windows images 2021-10-11 12:49:53 +02:00
1c2475d42d clean up temporary files left over from wine 2021-10-11 12:22:05 +02:00
2 changed files with 39 additions and 30 deletions

View File

@ -62,8 +62,8 @@ jobs:
C-Plus-Plus_arg: "",
fmt: "no",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=arm-linux-androideabi",
cpython: "no",
cpython_arg: "--host=arm-linux-androideabi --target=arm-linux-androideabi",
}
- {
image: "android-arm64",
@ -79,8 +79,8 @@ jobs:
C-Plus-Plus_arg: "",
fmt: "no",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-linux-android",
cpython: "no",
cpython_arg: "--host=aarch64-linux-android --target=aarch64-linux-android",
}
- {
image: "android-x86",
@ -96,8 +96,8 @@ jobs:
C-Plus-Plus_arg: "",
fmt: "no",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=i686-linux-android",
cpython: "no",
cpython_arg: "--host=i686-linux-android --target=i686-linux-android",
}
- {
image: "android-x86_64",
@ -113,8 +113,8 @@ jobs:
C-Plus-Plus_arg: "",
fmt: "no",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=x86_64-linux-android",
cpython: "no",
cpython_arg: "--host=x86_64-linux-android --target=x86_64-linux-android",
}
# Linux arm64/armv8 images
- {
@ -132,7 +132,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu",
cpython_arg: "--host=aarch64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu",
}
- {
image: "linux-arm64-lts",
@ -149,7 +149,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu",
cpython_arg: "--host=aarch64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu",
}
- {
image: "linux-arm64-musl",
@ -166,7 +166,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-linux-musl",
cpython_arg: "--host=aarch64-linux-musl --target=aarch64-linux-musl",
}
- {
image: "linux-arm64-full",
@ -183,7 +183,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu",
cpython_arg: "--host=aarch64-buildroot-linux-gnu --target=aarch64-buildroot-linux-gnu",
}
# Linux armv5 images
- {
@ -201,7 +201,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=armv5-unknown-linux-gnueabi",
cpython_arg: "--host=armv5-unknown-linux-gnueabi --target=armv5-unknown-linux-gnueabi",
}
- {
image: "linux-armv5-musl",
@ -218,7 +218,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=armv5-unknown-linux-musleabi",
cpython_arg: "--host=armv5-unknown-linux-musleabi --target=armv5-unknown-linux-musleabi",
}
# Linux armv6 images
- {
@ -236,7 +236,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=armv6-unknown-linux-gnueabihf",
cpython_arg: "--host=armv6-unknown-linux-gnueabihf --target=armv6-unknown-linux-gnueabihf",
}
- {
image: "linux-armv6-lts",
@ -253,7 +253,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=armv6-unknown-linux-gnueabihf",
cpython_arg: "--host=armv6-unknown-linux-gnueabihf --target=armv6-unknown-linux-gnueabihf",
}
- {
image: "linux-armv6-musl",
@ -270,7 +270,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=armv6-linux-musleabihf",
cpython_arg: "--host=armv6-linux-musleabihf --target=armv6-linux-musleabihf",
}
# Linux armv7 images
- {
@ -288,7 +288,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=armv7-unknown-linux-gnueabi",
cpython_arg: "--host=armv7-unknown-linux-gnueabi --target=armv7-unknown-linux-gnueabi",
}
- {
image: "linux-armv7a",
@ -305,7 +305,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=arm-cortexa8_neon-linux-gnueabihf",
cpython_arg: "--host=arm-cortexa8_neon-linux-gnueabihf --target=arm-cortexa8_neon-linux-gnueabihf",
}
- {
image: "linux-armv7l-musl",
@ -322,7 +322,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=armv7l-linux-musleabihf",
cpython_arg: "--host=armv7l-linux-musleabihf --target=armv7l-linux-musleabihf",
}
# Linux x86 images
- {
@ -409,7 +409,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=x86_64-buildroot-linux-gnu",
cpython_arg: "--host=x86_64-buildroot-linux-gnu --target=x86_64-buildroot-linux-gnu",
}
# Linux riscv images
- {
@ -427,7 +427,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=riscv32-unknown-linux-gnu",
cpython_arg: "--host=riscv32-unknown-linux-gnu --target=riscv32-unknown-linux-gnu",
}
- {
image: "linux-riscv64",
@ -444,7 +444,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=riscv64-unknown-linux-gnu",
cpython_arg: "--host=riscv64-unknown-linux-gnu --target=riscv64-unknown-linux-gnu",
}
# Linux s390x images
- {
@ -462,7 +462,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=s390x-ibm-linux-gnu",
cpython_arg: "--host=s390x-ibm-linux-gnu --target=s390x-ibm-linux-gnu",
}
# Linux mips images
- {
@ -480,7 +480,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=mips-unknown-linux-gnu",
cpython_arg: "--host=mips-unknown-linux-gnu --target=mips-unknown-linux-gnu",
}
# Linux ppc64le images
- {
@ -498,7 +498,7 @@ jobs:
fmt: "yes",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=powerpc64le-unknown-linux-gnu",
cpython_arg: "--host=powerpc64le-unknown-linux-gnu --target=powerpc64le-unknown-linux-gnu",
}
# Linux m68k images
- {
@ -516,7 +516,7 @@ jobs:
fmt: "no",
fmt_arg: "",
cpython: "no",
cpython_arg: "--host=x86_64-linux-gnu --build=m68k-unknown-uclinux-uclibc",
cpython_arg: "--host=m68k-unknown-uclinux-uclibc --target=m68k-unknown-uclinux-uclibc",
}
# Linux xtensa images
- {
@ -534,7 +534,7 @@ jobs:
fmt: "no",
fmt_arg: "",
cpython: "yes",
cpython_arg: "--host=x86_64-linux-gnu --build=xtensa-fsf-linux-uclibc",
cpython_arg: "--host=xtensa-fsf-linux-uclibc --target=xtensa-fsf-linux-uclibc",
}
# Windows x86_x64 images
- {
@ -838,7 +838,7 @@ jobs:
run: |
git clone --depth 1 --branch v3.9.2 https://github.com/python/cpython.git
cd cpython
./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./configure ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no --disable-ipv6 ${{ matrix.arch_name.cpython_arg }}
./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./configure ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no --disable-ipv6 ${{ matrix.arch_name.cpython_arg }} --build=x86_64-linux-gnu --enable-shared
./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2
cd ..
rm -rf cpython

View File

@ -54,6 +54,7 @@ RUN \
libc6-dev-i386 \
lzip \
make \
nsis \
openssl \
p7zip-full \
patch \
@ -107,12 +108,20 @@ RUN \
#
echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE} && \
#
# Add a sysmbolic link for makensis
#
ln -s /usr/bin/makensis /usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-makensis && \
#
# Replace cmake and cpack binaries
#
cd /usr/bin && \
rm cmake cpack && \
ln -s /usr/src/mxe/usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-cmake cmake && \
ln -s /usr/src/mxe/usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-cpack cpack
ln -s /usr/src/mxe/usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-cpack cpack && \
#
# clean up temporary wine files
#
rm -rf /tmp/wine-*
ENV PATH ${PATH}:/usr/src/mxe/usr/bin
ENV CROSS_TRIPLE ${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}