mirror of
				https://github.com/bensuperpc/dockcross.git
				synced 2025-10-29 23:36:22 +01:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			update_ope
			...
			fix-androi
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | a4576a5da4 | 
							
								
								
									
										79
									
								
								.github/workflows/main.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										79
									
								
								.github/workflows/main.yml
									
									
									
									
										vendored
									
									
								
							| @@ -40,71 +40,22 @@ jobs: | ||||
|             docker image push dockcross/base --all-tags | ||||
|  | ||||
|   image: | ||||
|     name: ${{ matrix.arch_name.image }} | ||||
|     name: ${{ matrix.arch_name }} | ||||
|     needs: base | ||||
|     runs-on: ubuntu-latest | ||||
|     strategy: | ||||
|       fail-fast: false | ||||
|       matrix: | ||||
|         arch_name: | ||||
|         # Android images | ||||
|           - { image: "android-arm", arch: "arm" } | ||||
|           - { image: "android-arm64", arch: "arm64" } | ||||
|           - { image: "android-x86", arch: "x86" } | ||||
|           - { image: "android-x86_64", arch: "x86_64" } | ||||
|         # Linux arm64/armv8 images | ||||
|           - { image: "linux-arm64", arch: "arm64" } | ||||
|           - { image: "linux-arm64-musl", arch: "arm64" } | ||||
|           - { image: "linux-arm64-full", arch: "arm64" } | ||||
|         # Linux armv5 images | ||||
|           - { image: "linux-armv5", arch: "armv5" } | ||||
|           - { image: "linux-armv5-musl", arch: "armv5" } | ||||
|         # Linux armv6 images | ||||
|           - { image: "linux-armv6", arch: "armv6" } | ||||
|           - { image: "linux-armv6-lts", arch: "armv6" } | ||||
|           - { image: "linux-armv6-musl", arch: "armv6" } | ||||
|         # Linux armv7 images | ||||
|           - { image: "linux-armv7", arch: "armv7" } | ||||
|           - { image: "linux-armv7a", arch: "armv7" } | ||||
|           - { image: "linux-armv7l-musl", arch: "armv7" } | ||||
|         # Linux x86 images | ||||
|           - { image: "linux-x86", arch: "x86" } | ||||
|         # Linux x86_64 images | ||||
|           - { image: "linux-x64", arch: "x86_64" } | ||||
|           - { image: "linux-x64-tinycc", arch: "x86_64" } | ||||
|           - { image: "linux-x64-clang", arch: "x86_64" } | ||||
|           - { image: "linux-x86_64-full", arch: "x86_64" } | ||||
|         # Linux riscv images | ||||
|           - { image: "linux-riscv32", arch: "riscv32" } | ||||
|           - { image: "linux-riscv64", arch: "riscv64" } | ||||
|         # Linux s390x images | ||||
|           - { image: "linux-s390x", arch: "s390x" } | ||||
|         # Linux mips images | ||||
|           - { image: "linux-mips", arch: "mips" } | ||||
|         # Linux ppc64le images | ||||
|           - { image: "linux-ppc64le", arch: "ppc64le" } | ||||
|         # Linux m68k images | ||||
|           - { image: "linux-m68k-uclibc", arch: "m68k" } | ||||
|         # Linux xtensa images | ||||
|           - { image: "linux-xtensa-uclibc", arch: "xtensa" } | ||||
|         # Windows x86_x64 images | ||||
|           - { image: "windows-static-x64", arch: "x86_x64" } | ||||
|           - { image: "windows-static-x64-posix", arch: "x86_x64" } | ||||
|           - { image: "windows-static-x64", arch: "x86_x64" } | ||||
|           - { image: "windows-shared-x64", arch: "x86_x64" } | ||||
|           - { image: "windows-shared-x64-posix", arch: "x64" } | ||||
|         # Windows x86 images | ||||
|           - { image: "windows-static-x86", arch: "x86" } | ||||
|           - { image: "windows-shared-x86", arch: "x86" } | ||||
|         # Windows arm images | ||||
|           - { image: "windows-armv7", arch: "armv7" } | ||||
|           - { image: "windows-arm64", arch: "arm64" } | ||||
|         # manylinux2014 images | ||||
|           - { image: "manylinux2014-x86", arch: "x86" } | ||||
|           - { image: "manylinux2014-x64", arch: "x86_64" } | ||||
|           - { image: "manylinux2014-aarch64", arch: "arm64" } | ||||
|         # web-wasm images | ||||
|           - { image: "web-wasm", arch: "JS" } | ||||
|         arch_name: [android-arm, android-arm64, android-x86, android-x86_64,  | ||||
|           linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl,  | ||||
|           linux-armv6, linux-armv6-lts, linux-armv6-musl, linux-arm64-full,  | ||||
|           linux-armv7, linux-armv7a, linux-armv7l-musl,  | ||||
|           linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-x86_64-full, | ||||
|           linux-mips, linux-ppc64le, web-wasm, | ||||
|           manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, | ||||
|           windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-armv7, | ||||
|           windows-shared-x64, windows-shared-x64-posix, windows-shared-x86, windows-arm64,  | ||||
|           linux-riscv64, linux-riscv32, linux-m68k-uclibc, linux-xtensa-uclibc, linux-x64-tinycc] | ||||
|     steps: | ||||
|       - uses: actions/checkout@v2 | ||||
|       - uses: actions/download-artifact@v2 | ||||
| @@ -114,11 +65,11 @@ jobs: | ||||
|       - name: load base | ||||
|         run: xz -d -k < ./cache/base.tar.xz | docker load | ||||
|       - name: build | ||||
|         run: make ${{ matrix.arch_name.image }} | ||||
|       - name: basic test | ||||
|         run: make ${{ matrix.arch_name.image }}.test | ||||
|         run: make ${{ matrix.arch_name }} | ||||
|       - name: test | ||||
|         run: make ${{ matrix.arch_name }}.test | ||||
|       - name: deploy | ||||
|         if: github.ref == 'refs/heads/master' | ||||
|         run: | | ||||
|             docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} | ||||
|             docker image push dockcross/${{ matrix.arch_name.image }} --all-tags | ||||
|             docker image push dockcross/${{ matrix.arch_name }} --all-tags | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|  | ||||
| set -ex | ||||
|  | ||||
| OPENSSH_ROOT=V_8_7_P1 | ||||
| OPENSSH_ROOT=V_8_5_P1 | ||||
|  | ||||
| cd /usr/src | ||||
| curl --connect-timeout 20 \ | ||||
|   | ||||
| @@ -3,8 +3,8 @@ FROM dockcross/base:latest | ||||
| # This is for 64-bit ARM Linux machine | ||||
|  | ||||
| # Buildroot version | ||||
| # buildroot master 2021-08-30 | ||||
| ENV BR_VERSION 2990d7dcb163a5618100a6985726b6820457a6d1 | ||||
| # crosstool-ng master 2021-08-21 | ||||
| ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01 | ||||
|  | ||||
| #include "common.buildroot" | ||||
|  | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| # | ||||
| # Automatically generated file; DO NOT EDIT. | ||||
| # Buildroot 2021.08-rc2-75-g2990d7dcb1 Configuration | ||||
| # Buildroot 2021.08-rc2-29-gdbe3af5532 Configuration | ||||
| # | ||||
| BR2_HAVE_DOT_CONFIG=y | ||||
| BR2_HOST_GCC_AT_LEAST_4_9=y | ||||
| @@ -186,7 +186,6 @@ BR2_SSP_NONE=y | ||||
| BR2_RELRO_NONE=y | ||||
| # BR2_RELRO_PARTIAL is not set | ||||
| # BR2_RELRO_FULL is not set | ||||
| BR2_FORTIFY_SOURCE_ARCH_SUPPORTS=y | ||||
| BR2_FORTIFY_SOURCE_NONE=y | ||||
| # BR2_FORTIFY_SOURCE_1 is not set | ||||
| # BR2_FORTIFY_SOURCE_2 is not set | ||||
| @@ -962,10 +961,6 @@ BR2_PACKAGE_SDL2=y | ||||
| # KMS/DRM video driver needs libdrm | ||||
| # | ||||
|  | ||||
| # | ||||
| # KMS/DRM video driver needs an OpenGL EGL backend provided by mesa3d | ||||
| # | ||||
|  | ||||
| # | ||||
| # OpenGL support needs X11 and an OpenGL provider | ||||
| # | ||||
| @@ -2204,7 +2199,7 @@ BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS=y | ||||
| BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y | ||||
| # BR2_PACKAGE_LAPACK is not set | ||||
| BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y | ||||
| BR2_PACKAGE_LIBABSEIL_CPP=y | ||||
| # BR2_PACKAGE_LIBABSEIL_CPP is not set | ||||
| # BR2_PACKAGE_LIBARGTABLE2 is not set | ||||
| BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y | ||||
| # BR2_PACKAGE_LIBATOMIC_OPS is not set | ||||
| @@ -2311,7 +2306,7 @@ BR2_PACKAGE_PROTOBUF=y | ||||
| # | ||||
| # BR2_PACKAGE_AUGEAS is not set | ||||
| # BR2_PACKAGE_ENCHANT is not set | ||||
| BR2_PACKAGE_FMT=y | ||||
| # BR2_PACKAGE_FMT is not set | ||||
| # BR2_PACKAGE_FSTRCMP is not set | ||||
| # BR2_PACKAGE_ICU is not set | ||||
| # BR2_PACKAGE_INIH is not set | ||||
|   | ||||
| @@ -3,8 +3,8 @@ FROM dockcross/base:latest | ||||
| # This is for 64-bit x86 Linux machine | ||||
|  | ||||
| # Buildroot version | ||||
| # buildroot master 2021-08-30 | ||||
| ENV BR_VERSION 2990d7dcb163a5618100a6985726b6820457a6d1 | ||||
| # crosstool-ng master 2021-08-21 | ||||
| ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01 | ||||
|  | ||||
| #include "common.buildroot" | ||||
|  | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| # | ||||
| # Automatically generated file; DO NOT EDIT. | ||||
| # Buildroot 2021.08-rc2-75-g2990d7dcb1 Configuration | ||||
| # Buildroot 2021.08-rc2-29-gdbe3af5532 Configuration | ||||
| # | ||||
| BR2_HAVE_DOT_CONFIG=y | ||||
| BR2_HOST_GCC_AT_LEAST_4_9=y | ||||
| @@ -147,7 +147,6 @@ BR2_SSP_NONE=y | ||||
| BR2_RELRO_NONE=y | ||||
| # BR2_RELRO_PARTIAL is not set | ||||
| # BR2_RELRO_FULL is not set | ||||
| BR2_FORTIFY_SOURCE_ARCH_SUPPORTS=y | ||||
| BR2_FORTIFY_SOURCE_NONE=y | ||||
| # BR2_FORTIFY_SOURCE_1 is not set | ||||
| # BR2_FORTIFY_SOURCE_2 is not set | ||||
| @@ -932,10 +931,6 @@ BR2_PACKAGE_SDL2=y | ||||
| # KMS/DRM video driver needs libdrm | ||||
| # | ||||
|  | ||||
| # | ||||
| # KMS/DRM video driver needs an OpenGL EGL backend provided by mesa3d | ||||
| # | ||||
|  | ||||
| # | ||||
| # OpenGL support needs X11 and an OpenGL provider | ||||
| # | ||||
| @@ -2181,7 +2176,7 @@ BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS=y | ||||
| BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y | ||||
| # BR2_PACKAGE_LAPACK is not set | ||||
| BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y | ||||
| BR2_PACKAGE_LIBABSEIL_CPP=y | ||||
| # BR2_PACKAGE_LIBABSEIL_CPP is not set | ||||
| # BR2_PACKAGE_LIBARGTABLE2 is not set | ||||
| BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y | ||||
| # BR2_PACKAGE_LIBATOMIC_OPS is not set | ||||
| @@ -2289,7 +2284,7 @@ BR2_PACKAGE_PROTOBUF=y | ||||
| # | ||||
| # BR2_PACKAGE_AUGEAS is not set | ||||
| # BR2_PACKAGE_ENCHANT is not set | ||||
| BR2_PACKAGE_FMT=y | ||||
| # BR2_PACKAGE_FMT is not set | ||||
| # BR2_PACKAGE_FSTRCMP is not set | ||||
| # BR2_PACKAGE_ICU is not set | ||||
| # BR2_PACKAGE_INIH is not set | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| FROM emscripten/emsdk:2.0.29 | ||||
| FROM emscripten/emsdk:2.0.27 | ||||
| MAINTAINER Matt McCormick "matt.mccormick@kitware.com" | ||||
|  | ||||
| # Revert back to "/bin/sh" as default shell | ||||
| @@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python | ||||
|  | ||||
| #include "common.docker" | ||||
|  | ||||
| ENV EMSCRIPTEN_VERSION 2.0.29 | ||||
| ENV EMSCRIPTEN_VERSION 2.0.27 | ||||
|  | ||||
| ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH} | ||||
| ENV CC=/emsdk/upstream/emscripten/emcc \ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user