Revert "try fix arm64 linux ci and publish error log (#8730)" (#8732)

setup a selfhost and will fix it later

This reverts commit a4565bf0da.
This commit is contained in:
21pages 2024-07-17 13:35:32 +08:00 committed by GitHub
parent 901505e8be
commit e283d33f28
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1056,24 +1056,10 @@ 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
@ -1365,25 +1351,11 @@ 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