From a4565bf0da99b21d8ba3e38cad5e75118b79921d Mon Sep 17 00:00:00 2001 From: 21pages Date: Wed, 17 Jul 2024 11:40:50 +0800 Subject: [PATCH] try fix arm64 linux ci and publish error log (#8730) FFmepg can be built on arm64 ubuntu vm, possible reason is that the condition of nvcodec can't be satisfied. If this still can't work, nvcodec can be removed for arm linux. Signed-off-by: 21pages --- .github/workflows/flutter-build.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index ff406766b..59273667e 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -1056,10 +1056,24 @@ jobs: - name: Install vcpkg dependencies if: matrix.job.arch == 'x86_64' || env.UPLOAD_ARTIFACT == 'true' + continue-on-error: true run: | + if [[ "${{ matrix.job.arch }}" == "aarch64" ]]; then + sudo apt-get install -y clang + fi $VCPKG_ROOT/vcpkg install --triplet ${{ matrix.job.vcpkg-triplet }} --x-install-root="$VCPKG_ROOT/installed" shell: bash + - name: Publish vcpkg log files + if: matrix.job.arch == 'aarch64' + uses: softprops/action-gh-release@v1 + with: + prerelease: true + tag_name: ${{ env.TAG_NAME }} + files: | + /opt/artifacts/vcpkg/buildtrees/ffmpeg/build-arm64-linux-rel-out.log + /opt/artifacts/vcpkg/buildtrees/ffmpeg/build-arm64-linux-rel-err.log + - name: Restore bridge files if: matrix.job.arch == 'x86_64' || env.UPLOAD_ARTIFACT == 'true' uses: actions/download-artifact@master @@ -1351,11 +1365,25 @@ jobs: vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }} - name: Install vcpkg dependencies + continue-on-error: true run: | cp $PWD/res/vcpkg/linux.cmake $VCPKG_ROOT/scripts/toolchains/linux.cmake + if [[ "${{ matrix.job.arch }}" == "armv7" ]]; then + sudo apt-get install -y clang + fi $VCPKG_ROOT/vcpkg install --triplet ${{ matrix.job.vcpkg-triplet }} --x-install-root="$VCPKG_ROOT/installed" shell: bash + - name: Publish vcpkg log files + if: matrix.job.arch == 'armv7' + uses: softprops/action-gh-release@v1 + with: + prerelease: true + tag_name: ${{ env.TAG_NAME }} + files: | + /opt/artifacts/vcpkg/buildtrees/ffmpeg/build-arm-linux-rel-out.log + /opt/artifacts/vcpkg/buildtrees/ffmpeg/build-arm-linux-rel-err.log + - uses: rustdesk-org/run-on-arch-action@amd64-support name: Build rustdesk sciter binary for ${{ matrix.job.arch }} id: vcpkg