Fix arm32 sciter build (#8803)
Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
This commit is contained in:
		
							parent
							
								
									b26acde450
								
							
						
					
					
						commit
						51a60a7eed
					
				
							
								
								
									
										39
									
								
								.github/workflows/flutter-build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										39
									
								
								.github/workflows/flutter-build.yml
									
									
									
									
										vendored
									
									
								
							| @ -1314,22 +1314,6 @@ jobs: | |||||||
|             core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); |             core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); | ||||||
|             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); |             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); | ||||||
| 
 | 
 | ||||||
|       - name: Install dependencies |  | ||||||
|         run: | |  | ||||||
|           sudo apt-get update |  | ||||||
|           sudo apt-get install -y \ |  | ||||||
|                cmake \ |  | ||||||
|                curl \ |  | ||||||
|                g++ \ |  | ||||||
|                gcc \ |  | ||||||
|                git \ |  | ||||||
|                nasm \ |  | ||||||
|                ninja-build \ |  | ||||||
|                pkg-config \ |  | ||||||
|                unzip \ |  | ||||||
|                xz-utils \ |  | ||||||
|                zip |  | ||||||
| 
 |  | ||||||
|       - name: Checkout source code |       - name: Checkout source code | ||||||
|         uses: actions/checkout@v3 |         uses: actions/checkout@v3 | ||||||
| 
 | 
 | ||||||
| @ -1350,17 +1334,6 @@ jobs: | |||||||
|           RUST_TOOLCHAIN_VERSION=$(cargo --version | awk '{print $2}') |           RUST_TOOLCHAIN_VERSION=$(cargo --version | awk '{print $2}') | ||||||
|           echo "RUST_TOOLCHAIN_VERSION=$RUST_TOOLCHAIN_VERSION" >> $GITHUB_ENV |           echo "RUST_TOOLCHAIN_VERSION=$RUST_TOOLCHAIN_VERSION" >> $GITHUB_ENV | ||||||
| 
 | 
 | ||||||
|       - name: Setup vcpkg with Github Actions binary cache |  | ||||||
|         uses: lukka/run-vcpkg@v11 |  | ||||||
|         with: |  | ||||||
|           vcpkgDirectory: /opt/artifacts/vcpkg |  | ||||||
|           vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }} |  | ||||||
| 
 |  | ||||||
|       - name: Override Linux compiler detection in vcpkg |  | ||||||
|         run: | |  | ||||||
|           cp $PWD/res/vcpkg/linux.cmake $VCPKG_ROOT/scripts/toolchains/linux.cmake |  | ||||||
|         shell: bash |  | ||||||
| 
 |  | ||||||
|       - uses: rustdesk-org/run-on-arch-action@amd64-support |       - uses: rustdesk-org/run-on-arch-action@amd64-support | ||||||
|         name: Build rustdesk sciter binary for ${{ matrix.job.arch }} |         name: Build rustdesk sciter binary for ${{ matrix.job.arch }} | ||||||
|         id: vcpkg |         id: vcpkg | ||||||
| @ -1409,7 +1382,8 @@ jobs: | |||||||
|                rpm \ |                rpm \ | ||||||
|                unzip \ |                unzip \ | ||||||
|                wget \ |                wget \ | ||||||
|                xz-utils |                xz-utils \ | ||||||
|  |                zip | ||||||
|             # install newer nasm for aom |             # install newer nasm for aom | ||||||
|             wget --output-document nasm.deb "http://ftp.us.debian.org/debian/pool/main/n/nasm/nasm_2.14-1_${{ matrix.job.deb_arch }}.deb" |             wget --output-document nasm.deb "http://ftp.us.debian.org/debian/pool/main/n/nasm/nasm_2.14-1_${{ matrix.job.deb_arch }}.deb" | ||||||
|             dpkg -i nasm.deb |             dpkg -i nasm.deb | ||||||
| @ -1421,6 +1395,15 @@ jobs: | |||||||
|             update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 1 |             update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 1 | ||||||
|             # vcpkg |             # vcpkg | ||||||
|             export VCPKG_ROOT=/opt/artifacts/vcpkg |             export VCPKG_ROOT=/opt/artifacts/vcpkg | ||||||
|  |             pushd /opt/artifacts | ||||||
|  |             git clone https://github.com/microsoft/vcpkg | ||||||
|  |             pushd vcpkg | ||||||
|  |             git reset --hard ${{ env.VCPKG_COMMIT_ID }} | ||||||
|  |             sh bootstrap-vcpkg.sh -disableMetrics | ||||||
|  |             popd | ||||||
|  |             popd | ||||||
|  |             # override Linux compiler detection in vcpkg | ||||||
|  |             cp $PWD/res/vcpkg/linux.cmake $VCPKG_ROOT/scripts/toolchains/linux.cmake | ||||||
|             $VCPKG_ROOT/vcpkg install --triplet ${{ matrix.job.vcpkg-triplet }} --x-install-root="$VCPKG_ROOT/installed" |             $VCPKG_ROOT/vcpkg install --triplet ${{ matrix.job.vcpkg-triplet }} --x-install-root="$VCPKG_ROOT/installed" | ||||||
|             # rust |             # rust | ||||||
|             pushd /opt |             pushd /opt | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user