fix architecture name

This commit is contained in:
Tianming Wu 2025-03-06 01:26:08 +08:00
commit dfb56cedec

View file

@ -121,13 +121,13 @@ jobs:
name: build-linux-x86_64-intermediate name: build-linux-x86_64-intermediate
path: release/work/build-linux-x86_64/dist-tar/ path: release/work/build-linux-x86_64/dist-tar/
build-linux-arm64: build-linux-aarch64:
runs-on: ubuntu-22.04-arm runs-on: ubuntu-22.04-arm
steps: steps:
- name: Check architecture - name: Check architecture
run: | run: |
arch=$(uname -m) arch=$(uname -m)
if [[ "$arch" != arm64 ]] if [[ "$arch" != aarch64 ]]
then then
echo "Unexpected architecture: $arch" >&2 echo "Unexpected architecture: $arch" >&2
exit 1 exit 1
@ -144,12 +144,12 @@ jobs:
libv4l-dev libv4l-dev
- name: Build - name: Build
run: release/build_linux.sh arm64 run: release/build_linux.sh aarch64
# upload-artifact does not preserve permissions # upload-artifact does not preserve permissions
- name: Tar - name: Tar
run: | run: |
cd release/work/build-linux-arm64 cd release/work/build-linux-aarch64
mkdir dist-tar mkdir dist-tar
cd dist-tar cd dist-tar
tar -C .. -cvf dist.tar.gz dist/ tar -C .. -cvf dist.tar.gz dist/
@ -157,8 +157,8 @@ jobs:
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: build-linux-arm64-intermediate name: build-linux-aarch64-intermediate
path: release/work/build-linux-arm64/dist-tar/ path: release/work/build-linux-aarch64/dist-tar/
build-win32: build-win32:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -232,7 +232,7 @@ jobs:
- name: Check architecture - name: Check architecture
run: | run: |
arch=$(uname -m) arch=$(uname -m)
if [[ "$arch" != arm64 ]] if [[ "$arch" != aarch64 ]]
then then
echo "Unexpected architecture: $arch" >&2 echo "Unexpected architecture: $arch" >&2
exit 1 exit 1
@ -335,10 +335,10 @@ jobs:
name: release-linux-x86_64 name: release-linux-x86_64
path: release/output/ path: release/output/
package-linux-arm64: package-linux-aarch64:
needs: needs:
- build-scrcpy-server - build-scrcpy-server
- build-linux-arm64 - build-linux-aarch64
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout code - name: Checkout code
@ -350,25 +350,25 @@ jobs:
name: scrcpy-server name: scrcpy-server
path: release/work/build-server/server/ path: release/work/build-server/server/
- name: Download build-linux-arm64 - name: Download build-linux-aarch64
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: build-linux-arm64-intermediate name: build-linux-aarch64-intermediate
path: release/work/build-linux-arm64/dist-tar/ path: release/work/build-linux-aarch64/dist-tar/
# upload-artifact does not preserve permissions # upload-artifact does not preserve permissions
- name: Detar - name: Detar
run: | run: |
cd release/work/build-linux-arm64 cd release/work/build-linux-aarch64
tar xf dist-tar/dist.tar.gz tar xf dist-tar/dist.tar.gz
- name: Package - name: Package
run: release/package_client.sh linux-arm64 tar.gz run: release/package_client.sh linux-aarch64 tar.gz
- name: Upload release - name: Upload release
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: release-linux-arm64 name: release-linux-aarch64
path: release/output/ path: release/output/
package-win32: package-win32:
@ -519,7 +519,7 @@ jobs:
needs: needs:
- build-scrcpy-server - build-scrcpy-server
- package-linux-x86_64 - package-linux-x86_64
- package-linux-arm64 - package-linux-aarch64
- package-win32 - package-win32
- package-win64 - package-win64
- package-macos-aarch64 - package-macos-aarch64
@ -541,10 +541,10 @@ jobs:
name: release-linux-x86_64 name: release-linux-x86_64
path: release/output/ path: release/output/
- name: Download release-linux-arm64 - name: Download release-linux-aarch64
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: release-linux-arm64 name: release-linux-aarch64
path: release/output/ path: release/output/
- name: Download release-win32 - name: Download release-win32