fix ci
This commit is contained in:
		
							parent
							
								
									f15bf8166f
								
							
						
					
					
						commit
						62d6ee46c4
					
				
							
								
								
									
										40
									
								
								.github/workflows/flutter-build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										40
									
								
								.github/workflows/flutter-build.yml
									
									
									
									
										vendored
									
									
								
							| @ -394,7 +394,7 @@ jobs: | |||||||
| 
 | 
 | ||||||
|   build-rustdesk-ios: |   build-rustdesk-ios: | ||||||
|     if: ${{ inputs.upload-artifact }} |     if: ${{ inputs.upload-artifact }} | ||||||
|     name: build rustdesk ios ipa ${{ matrix.job.target }} (${{ matrix.job.os }}) [${{ matrix.job.extra-build-features }}] |     name: build rustdesk ios ipa | ||||||
|     runs-on: ${{ matrix.job.os }} |     runs-on: ${{ matrix.job.os }} | ||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
| @ -404,7 +404,6 @@ jobs: | |||||||
|               arch: aarch64, |               arch: aarch64, | ||||||
|               target: aarch64-apple-ios, |               target: aarch64-apple-ios, | ||||||
|               os: macos-13, |               os: macos-13, | ||||||
|               extra-build-features: "", |  | ||||||
|             } |             } | ||||||
|     steps: |     steps: | ||||||
|       - name: Export GitHub Actions cache environment variables |       - name: Export GitHub Actions cache environment variables | ||||||
| @ -445,7 +444,7 @@ jobs: | |||||||
|       - uses: Swatinem/rust-cache@v2 |       - uses: Swatinem/rust-cache@v2 | ||||||
|         with: |         with: | ||||||
|           prefix-key: rustdesk-lib-cache-ios |           prefix-key: rustdesk-lib-cache-ios | ||||||
|           key: ${{ matrix.job.target }}-${{ matrix.job.extra-build-features }} |           key: ${{ matrix.job.target }} | ||||||
| 
 | 
 | ||||||
|       - name: Install flutter rust bridge deps |       - name: Install flutter rust bridge deps | ||||||
|         shell: bash |         shell: bash | ||||||
| @ -756,7 +755,7 @@ jobs: | |||||||
| 
 | 
 | ||||||
|   build-rustdesk-android: |   build-rustdesk-android: | ||||||
|     needs: [generate-bridge-linux] |     needs: [generate-bridge-linux] | ||||||
|     name: build rustdesk android apk ${{ matrix.job.target }} (${{ matrix.job.os }}) [${{ matrix.job.extra-build-features }}] |     name: build rustdesk android apk ${{ matrix.job.target }} | ||||||
|     runs-on: ${{ matrix.job.os }} |     runs-on: ${{ matrix.job.os }} | ||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
| @ -766,14 +765,12 @@ jobs: | |||||||
|               arch: aarch64, |               arch: aarch64, | ||||||
|               target: aarch64-linux-android, |               target: aarch64-linux-android, | ||||||
|               os: ubuntu-20.04, |               os: ubuntu-20.04, | ||||||
|               extra-build-features: "", |  | ||||||
|               openssl-arch: android-arm64, |               openssl-arch: android-arm64, | ||||||
|             } |             } | ||||||
|           - { |           - { | ||||||
|               arch: armv7, |               arch: armv7, | ||||||
|               target: armv7-linux-androideabi, |               target: armv7-linux-androideabi, | ||||||
|               os: ubuntu-20.04, |               os: ubuntu-20.04, | ||||||
|               extra-build-features: "", |  | ||||||
|               openssl-arch: android-arm, |               openssl-arch: android-arm, | ||||||
|             } |             } | ||||||
|     steps: |     steps: | ||||||
| @ -867,7 +864,7 @@ jobs: | |||||||
|       - uses: Swatinem/rust-cache@v2 |       - uses: Swatinem/rust-cache@v2 | ||||||
|         with: |         with: | ||||||
|           prefix-key: rustdesk-lib-cache-android # TODO: drop '-android' part after caches are invalidated |           prefix-key: rustdesk-lib-cache-android # TODO: drop '-android' part after caches are invalidated | ||||||
|           key: ${{ matrix.job.target }}-${{ matrix.job.extra-build-features }} |           key: ${{ matrix.job.target }} | ||||||
| 
 | 
 | ||||||
|       - name: Build rustdesk lib |       - name: Build rustdesk lib | ||||||
|         env: |         env: | ||||||
| @ -962,7 +959,7 @@ jobs: | |||||||
| 
 | 
 | ||||||
|   build-rustdesk-linux: |   build-rustdesk-linux: | ||||||
|     needs: [generate-bridge-linux] |     needs: [generate-bridge-linux] | ||||||
|     name: build-rust-lib ${{ matrix.job.target }} ${{ matrix.job.extra-build-features }} |     name: build-rust-lib ${{ matrix.job.target }}  | ||||||
|     runs-on: ${{ matrix.job.on }} |     runs-on: ${{ matrix.job.on }} | ||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
| @ -1042,7 +1039,7 @@ jobs: | |||||||
|           vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }} |           vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }} | ||||||
| 
 | 
 | ||||||
|       - name: Install vcpkg dependencies |       - name: Install vcpkg dependencies | ||||||
|         if: matrix.job.extra-build-features == '' || env.UPLOAD_ARTIFACT == 'true' |         if: env.UPLOAD_ARTIFACT == 'true' | ||||||
|         run: | |         run: | | ||||||
|           case ${{ matrix.job.target }} in |           case ${{ matrix.job.target }} in | ||||||
|             aarch64-unknown-linux-gnu) |             aarch64-unknown-linux-gnu) | ||||||
| @ -1063,7 +1060,7 @@ jobs: | |||||||
|       - uses: rustdesk-org/run-on-arch-action@amd64-support |       - uses: rustdesk-org/run-on-arch-action@amd64-support | ||||||
|         name: Build rustdesk library for ${{ matrix.job.arch }} |         name: Build rustdesk library for ${{ matrix.job.arch }} | ||||||
|         id: vcpkg |         id: vcpkg | ||||||
|         if: matrix.job.extra-build-features == '' || env.UPLOAD_ARTIFACT == 'true' |         if: env.UPLOAD_ARTIFACT == 'true' | ||||||
|         with: |         with: | ||||||
|           arch: ${{ matrix.job.arch }} |           arch: ${{ matrix.job.arch }} | ||||||
|           distro: ${{ matrix.job.distro }} |           distro: ${{ matrix.job.distro }} | ||||||
| @ -1221,15 +1218,15 @@ jobs: | |||||||
|             rustdesk-*.deb |             rustdesk-*.deb | ||||||
|             rustdesk-*.rpm |             rustdesk-*.rpm | ||||||
| 
 | 
 | ||||||
|       - name: Upload Artifact |       - name: Upload deb  | ||||||
|         uses: actions/upload-artifact@master |         uses: actions/upload-artifact@master | ||||||
|         if: matrix.job.extra-build-features == 'flatpak' && env.UPLOAD_ARTIFACT == 'true' |         if: env.UPLOAD_ARTIFACT == 'true' | ||||||
|         with: |         with: | ||||||
|           name: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb |           name: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb | ||||||
|           path: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb |           path: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb | ||||||
|        |        | ||||||
|       - name: Patch archlinux PKGBUILD |       - name: Patch archlinux PKGBUILD | ||||||
|         if: matrix.job.extra-build-features == '' && env.UPLOAD_ARTIFACT == 'true' |         if: env.UPLOAD_ARTIFACT == 'true' | ||||||
|         run: | |         run: | | ||||||
|           sed -i "s/x86_64/${{ matrix.job.arch }}/g" res/PKGBUILD |           sed -i "s/x86_64/${{ matrix.job.arch }}/g" res/PKGBUILD | ||||||
|           if [[ "${{ matrix.job.arch }}" == "aarch64" ]]; then |           if [[ "${{ matrix.job.arch }}" == "aarch64" ]]; then | ||||||
| @ -1237,7 +1234,7 @@ jobs: | |||||||
|           fi |           fi | ||||||
| 
 | 
 | ||||||
|       - name: Build archlinux package |       - name: Build archlinux package | ||||||
|         if: matrix.job.extra-build-features == '' && env.UPLOAD_ARTIFACT == 'true' |         if: env.UPLOAD_ARTIFACT == 'true' | ||||||
|         uses: rustdesk-org/arch-makepkg-action@master |         uses: rustdesk-org/arch-makepkg-action@master | ||||||
|         with: |         with: | ||||||
|           packages: > |           packages: > | ||||||
| @ -1274,7 +1271,7 @@ jobs: | |||||||
|             cd res && HBB=`pwd`/.. FLUTTER=1 makepkg -f |             cd res && HBB=`pwd`/.. FLUTTER=1 makepkg -f | ||||||
| 
 | 
 | ||||||
|       - name: Publish archlinux package |       - name: Publish archlinux package | ||||||
|         if: matrix.job.extra-build-features == '' && env.UPLOAD_ARTIFACT == 'true' |         if: env.UPLOAD_ARTIFACT == 'true' | ||||||
|         uses: softprops/action-gh-release@v1 |         uses: softprops/action-gh-release@v1 | ||||||
|         with: |         with: | ||||||
|           prerelease: true |           prerelease: true | ||||||
| @ -1297,7 +1294,6 @@ jobs: | |||||||
|               target: armv7-unknown-linux-gnueabihf, |               target: armv7-unknown-linux-gnueabihf, | ||||||
|               deb-arch: armhf, |               deb-arch: armhf, | ||||||
|               use-cross: true, |               use-cross: true, | ||||||
|               extra-build-features: "", |  | ||||||
|             } |             } | ||||||
|     steps: |     steps: | ||||||
|       - name: Export GitHub Actions cache environment variables |       - name: Export GitHub Actions cache environment variables | ||||||
| @ -1429,7 +1425,7 @@ jobs: | |||||||
|             export VCPKG_ROOT=/opt/artifacts/vcpkg |             export VCPKG_ROOT=/opt/artifacts/vcpkg | ||||||
|             export ARCH=armhf |             export ARCH=armhf | ||||||
|             export CARGO_INCREMENTAL=0 |             export CARGO_INCREMENTAL=0 | ||||||
|             cargo build --features inline,${{ matrix.job.extra-build-features }} --release --bins --jobs 3 |             cargo build --features inline --release --bins --jobs 3 | ||||||
|             # package |             # package | ||||||
|             mkdir -p ./Release |             mkdir -p ./Release | ||||||
|             mv ./target/release/rustdesk ./Release/rustdesk |             mv ./target/release/rustdesk ./Release/rustdesk | ||||||
| @ -1445,7 +1441,7 @@ jobs: | |||||||
|           done |           done | ||||||
| 
 | 
 | ||||||
|       - name: Publish debian package |       - name: Publish debian package | ||||||
|         if: matrix.job.extra-build-features == '' && env.UPLOAD_ARTIFACT == 'true' |         if: env.UPLOAD_ARTIFACT == 'true' | ||||||
|         uses: softprops/action-gh-release@v1 |         uses: softprops/action-gh-release@v1 | ||||||
|         with: |         with: | ||||||
|           prerelease: true |           prerelease: true | ||||||
| @ -1453,13 +1449,6 @@ jobs: | |||||||
|           files: | |           files: | | ||||||
|             rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}-sciter.deb |             rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}-sciter.deb | ||||||
| 
 | 
 | ||||||
|       - name: Upload Artifact |  | ||||||
|         uses: actions/upload-artifact@master |  | ||||||
|         if: ${{ contains(matrix.job.extra-build-features, 'flatpak') }} |  | ||||||
|         with: |  | ||||||
|           name: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}-sciter.deb |  | ||||||
|           path: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}-sciter.deb |  | ||||||
| 
 |  | ||||||
|   build-flatpak-appimage: |   build-flatpak-appimage: | ||||||
|     name: Build Flatpak ${{ matrix.job.target }} |     name: Build Flatpak ${{ matrix.job.target }} | ||||||
|     needs: [build-rustdesk-linux] |     needs: [build-rustdesk-linux] | ||||||
| @ -1497,7 +1486,6 @@ jobs: | |||||||
|           mv rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb rustdesk-${{ env.VERSION }}.deb |           mv rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb rustdesk-${{ env.VERSION }}.deb | ||||||
| 
 | 
 | ||||||
|       - name: Build appimage package |       - name: Build appimage package | ||||||
|         if: matrix.job.extra-build-features == 'appimage' && env.UPLOAD_ARTIFACT == 'true' |  | ||||||
|         shell: bash |         shell: bash | ||||||
|         run: | |         run: | | ||||||
|           # set-up appimage-builder |           # set-up appimage-builder | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user