mirror of
				https://github.com/bensuperpc/dockcross.git
				synced 2025-10-31 08:06:23 +01:00 
			
		
		
		
	Compare commits
	
		
			11 Commits
		
	
	
		
			update_con
			...
			fix_error
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 96839c5789 | |||
| eda038eacf | |||
| daad4d760d | |||
| 979104089a | |||
| 7876c21e62 | |||
| 2ff17c20e8 | |||
| c068180665 | |||
| 63514041f6 | |||
| a0c458c8c1 | |||
| 3d5142d6ad | |||
| a5f1b3098a | 
							
								
								
									
										89
									
								
								.github/workflows/main.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										89
									
								
								.github/workflows/main.yml
									
									
									
									
										vendored
									
									
								
							| @@ -18,24 +18,45 @@ jobs: | |||||||
|     name: base |     name: base | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|       - uses: actions/checkout@v3 |       - name: checkout code | ||||||
|  |         uses: actions/checkout@v3 | ||||||
|  |         with: | ||||||
|  |           submodules: "recursive" | ||||||
|  |           fetch-depth: 1 | ||||||
|  |  | ||||||
|       - name: build |       - name: build | ||||||
|         run: make base |         uses: nick-fields/retry@v2 | ||||||
|  |         with: | ||||||
|  |           timeout_minutes: 120 | ||||||
|  |           retry_wait_seconds: 40 | ||||||
|  |           max_attempts: 3 | ||||||
|  |           retry_on: error | ||||||
|  |           command: make base | ||||||
|  |  | ||||||
|       - name: test |       - name: test | ||||||
|         run: make base.test |         run: make base.test | ||||||
|  |  | ||||||
|       - name: archive base |       - name: archive base | ||||||
|         run: | |         run: | | ||||||
|           mkdir -p cache |           mkdir -p cache | ||||||
|           docker save dockcross/base:latest | xz -e9 -T0 > ./cache/base.tar.xz |           docker save dockcross/base:latest | xz -e9 -T0 > ./cache/base.tar.xz | ||||||
|  |  | ||||||
|       - name: save base |       - name: save base | ||||||
|         uses: actions/upload-artifact@v3 |         uses: actions/upload-artifact@v3 | ||||||
|         with: |         with: | ||||||
|           name: cache |           name: cache | ||||||
|           path: ./cache |           path: ./cache | ||||||
|           retention-days: 1 |           retention-days: 1 | ||||||
|  |  | ||||||
|       - name: deploy |       - name: deploy | ||||||
|         if: github.ref == 'refs/heads/master' |         if: github.ref == 'refs/heads/master' | ||||||
|         run: | |         uses: nick-fields/retry@v2 | ||||||
|  |         with: | ||||||
|  |           timeout_minutes: 30 | ||||||
|  |           retry_wait_seconds: 30 | ||||||
|  |           max_attempts: 4 | ||||||
|  |           retry_on: error | ||||||
|  |           command: | | ||||||
|             docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} |             docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} | ||||||
|             docker image push dockcross/base --all-tags |             docker image push dockcross/base --all-tags | ||||||
|  |  | ||||||
| @@ -833,39 +854,56 @@ jobs: | |||||||
|               cpython_arg: "", |               cpython_arg: "", | ||||||
|             } |             } | ||||||
|     steps: |     steps: | ||||||
|       - uses: actions/checkout@v3 |       - name: checkout code | ||||||
|  |         uses: actions/checkout@v3 | ||||||
|  |         with: | ||||||
|  |           submodules: "recursive" | ||||||
|  |           fetch-depth: 1 | ||||||
|  |  | ||||||
|       - uses: actions/download-artifact@v3 |       - uses: actions/download-artifact@v3 | ||||||
|         with: |         with: | ||||||
|           name: cache |           name: cache | ||||||
|           path: ./cache |           path: ./cache | ||||||
|  |  | ||||||
|       - name: load base |       - name: load base | ||||||
|         run: xz -d -k < ./cache/base.tar.xz | docker load |         run: xz -d -k < ./cache/base.tar.xz | docker load | ||||||
|  |  | ||||||
|       - name: build |       - name: build | ||||||
|         run: make ${{ matrix.arch_name.image }} |         uses: nick-fields/retry@v2 | ||||||
|  |         with: | ||||||
|  |           timeout_minutes: 360 | ||||||
|  |           retry_wait_seconds: 20 | ||||||
|  |           max_attempts: 3 | ||||||
|  |           retry_on: error | ||||||
|  |           command: make ${{ matrix.arch_name.image }} | ||||||
|  |  | ||||||
|       - name: basic test |       - name: basic test | ||||||
|         run: make ${{ matrix.arch_name.image }}.test |         run: make ${{ matrix.arch_name.image }}.test | ||||||
|       # Updated on 28/08/2021 |  | ||||||
|  |       # Updated on 19/05/2022 | ||||||
|       - name: stockfish build test |       - name: stockfish build test | ||||||
|         if: ${{ matrix.arch_name.stockfish == 'yes' }} |         if: ${{ matrix.arch_name.stockfish == 'yes' }} | ||||||
|         run: | |         run: | | ||||||
|           git clone --depth 1 --branch sf_14 https://github.com/official-stockfish/Stockfish.git |           git clone --depth 1 --branch sf_15 https://github.com/official-stockfish/Stockfish.git | ||||||
|           cd Stockfish/src |           cd Stockfish/src | ||||||
|           ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} net |           ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} net | ||||||
|           ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} build ${{ matrix.arch_name.stockfish_arg }} -j2 |           ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} build ${{ matrix.arch_name.stockfish_arg }} -j2 | ||||||
|           cd ../.. |           cd ../.. | ||||||
|           rm -rf Stockfish |           rm -rf Stockfish | ||||||
|       # Updated on 28/08/2021 |       # Updated on 19/05/2022 | ||||||
|  |  | ||||||
|       - name: ninja build test |       - name: ninja build test | ||||||
|         if: ${{ matrix.arch_name.ninja == 'yes' }} |         if: ${{ matrix.arch_name.ninja == 'yes' }} | ||||||
|         run: | |         run: | | ||||||
|           git clone --depth 1 --branch v1.10.2 https://github.com/ninja-build/ninja.git |           git clone --depth 1 --branch v1.11.0 https://github.com/ninja-build/ninja.git | ||||||
|           cd ninja |           cd ninja | ||||||
|           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.ninja_arg }} |           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.ninja_arg }} | ||||||
|       # Updated on 28/08/2021 |  | ||||||
|  |       # Updated on 19/05/2022 | ||||||
|       - name: openssl build test |       - name: openssl build test | ||||||
|         if: ${{ matrix.arch_name.openssl == 'yes' }} |         if: ${{ matrix.arch_name.openssl == 'yes' }} | ||||||
|         run: | |         run: | | ||||||
|           git clone --depth 1 --branch OpenSSL_1_1_1k https://github.com/openssl/openssl.git |           git clone --depth 1 --branch OpenSSL_1_1_1o https://github.com/openssl/openssl.git | ||||||
|           cd openssl |           cd openssl | ||||||
|           wget https://raw.githubusercontent.com/mavlink/MAVSDK/main/third_party/openssl/dockcross-android.patch |           wget https://raw.githubusercontent.com/mavlink/MAVSDK/main/third_party/openssl/dockcross-android.patch | ||||||
|           patch -p 0 < dockcross-android.patch |           patch -p 0 < dockcross-android.patch | ||||||
| @@ -873,47 +911,58 @@ jobs: | |||||||
|           ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2 |           ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2 | ||||||
|           cd .. |           cd .. | ||||||
|           rm -rf openssl |           rm -rf openssl | ||||||
|       # Updated on 28/08/2021 |  | ||||||
|  |       # Updated on 19/05/2022 | ||||||
|       - name: C build test |       - name: C build test | ||||||
|         if: ${{ matrix.arch_name.C == 'yes' }} |         if: ${{ matrix.arch_name.C == 'yes' }} | ||||||
|         run: | |         run: | | ||||||
|           git clone https://github.com/TheAlgorithms/C.git |           git clone https://github.com/TheAlgorithms/C.git | ||||||
|           cd C |           cd C | ||||||
|           git checkout cc241f58c253c533ac94e07151ef91a5ef7e5719 |           git checkout 2314a195862243e09c485a66194866517a6f8c31 | ||||||
|           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C_arg }} |           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C_arg }} | ||||||
|           cd .. |           cd .. | ||||||
|           rm -rf C |           rm -rf C | ||||||
|       # Updated on 28/08/2021 |  | ||||||
|  |       # Updated on 19/05/2022 | ||||||
|       - name: C-Plus-Plus build test |       - name: C-Plus-Plus build test | ||||||
|         if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' }} |         if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' }} | ||||||
|         run: | |         run: | | ||||||
|           git clone https://github.com/TheAlgorithms/C-Plus-Plus.git |           git clone https://github.com/TheAlgorithms/C-Plus-Plus.git | ||||||
|           cd C-Plus-Plus |           cd C-Plus-Plus | ||||||
|           git checkout c3b07aed2240e5364e1a49d091a00b61f520e653 |           git checkout 37a29008e6b77921a97a89ca8b7fd9e700aeccd0 | ||||||
|           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }} |           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }} | ||||||
|           cd .. |           cd .. | ||||||
|           rm -rf C-Plus-Plus |           rm -rf C-Plus-Plus | ||||||
|       # Updated on 28/08/2021 |  | ||||||
|  |       # Updated on 19/05/2022 | ||||||
|       - name: fmt build test |       - name: fmt build test | ||||||
|         if: ${{ matrix.arch_name.fmt == 'yes' }} |         if: ${{ matrix.arch_name.fmt == 'yes' }} | ||||||
|         run: | |         run: | | ||||||
|           git clone --depth 1 --branch 8.0.1 https://github.com/fmtlib/fmt.git |           git clone --depth 1 --branch 8.1.1 https://github.com/fmtlib/fmt.git | ||||||
|           cd fmt |           cd fmt | ||||||
|           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.fmt_arg }} -DFMT_DOC=OFF |           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.fmt_arg }} -DFMT_DOC=OFF | ||||||
|           cd .. |           cd .. | ||||||
|           rm -rf fmt |           rm -rf fmt | ||||||
|       # Updated on 05/10/2021 |  | ||||||
|  |       # Updated on 19/05/2022 | ||||||
|       - name: cpython build test |       - name: cpython build test | ||||||
|         if: ${{ matrix.arch_name.cpython == 'yes' }} |         if: ${{ matrix.arch_name.cpython == 'yes' }} | ||||||
|         run: | |         run: | | ||||||
|           git clone --depth 1 --branch v3.9.2 https://github.com/python/cpython.git |           git clone --depth 1 --branch v3.9.13 https://github.com/python/cpython.git | ||||||
|           cd cpython |           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 }} --build=x86_64-linux-gnu --enable-shared |           ./../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 |           ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2 | ||||||
|           cd .. |           cd .. | ||||||
|           rm -rf cpython |           rm -rf cpython | ||||||
|  |  | ||||||
|       - name: deploy |       - name: deploy | ||||||
|         if: github.ref == 'refs/heads/master' |         if: github.ref == 'refs/heads/master' | ||||||
|         run: | |         uses: nick-fields/retry@v2 | ||||||
|  |         with: | ||||||
|  |           timeout_minutes: 30 | ||||||
|  |           retry_wait_seconds: 30 | ||||||
|  |           max_attempts: 4 | ||||||
|  |           retry_on: error | ||||||
|  |           command: | | ||||||
|             docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} |             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.image }} --all-tags | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								LICENSE
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								LICENSE
									
									
									
									
									
								
							| @@ -1,4 +1,4 @@ | |||||||
| Copyright (c) 2015, 2016, 2017, 2018 Steeve Morin, Rob Burns, Matthew McCormick, Jean-Christophe-Fillion-Robin | Copyright (c) 2015, 2016, 2017, 2018, 2021 Steeve Morin, Rob Burns, Matthew McCormick, Jean-Christophe-Fillion-Robin, Bensuperpc | ||||||
|  |  | ||||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | Permission is hereby granted, free of charge, to any person obtaining a copy | ||||||
| of this software and associated documentation files (the "Software"), to deal | of this software and associated documentation files (the "Software"), to deal | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user