hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4487 from Kingtous/master

Browse Source 
fix: android ci
This commit is contained in:
RustDesk 2023-05-25 23:00:53 +08:00 committed by GitHub
commit c90b2db0a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/flutter-build.yml vendored
View File

@ -8,6 +8,7 @@ on:
default: true default: true
env: env:
CARGO_NDK_VERSION: "3.1.2"
LLVM_VERSION: "15.0.6" LLVM_VERSION: "15.0.6"
FLUTTER_VERSION: "3.10.1" FLUTTER_VERSION: "3.10.1"
FLUTTER_RUST_BRIDGE_VERSION: "1.75.3" FLUTTER_RUST_BRIDGE_VERSION: "1.75.3"
@ -19,7 +20,7 @@ env:
# for multiarch gcc compatibility # for multiarch gcc compatibility
VCPKG_COMMIT_ID: "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1" VCPKG_COMMIT_ID: "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1"
VERSION: "1.2.0" VERSION: "1.2.0"
NDK_VERSION: "r23" NDK_VERSION: "r25c"
#signing keys env variable checks #signing keys env variable checks
ANDROID_SIGNING_KEY: '${{ secrets.ANDROID_SIGNING_KEY }}' ANDROID_SIGNING_KEY: '${{ secrets.ANDROID_SIGNING_KEY }}'
MACOS_P12_BASE64: '${{ secrets.MACOS_P12_BASE64 }}' MACOS_P12_BASE64: '${{ secrets.MACOS_P12_BASE64 }}'
@ -535,7 +536,7 @@ jobs:
VCPKG_ROOT: /opt/rustdesk_thirdparty_lib/vcpkg VCPKG_ROOT: /opt/rustdesk_thirdparty_lib/vcpkg
run: | run: |
rustup target add ${{ matrix.job.target }} rustup target add ${{ matrix.job.target }}
cargo install cargo-ndk cargo install cargo-ndk --version ${{ env.CARGO_NDK_VERSION }}
case ${{ matrix.job.target }} in case ${{ matrix.job.target }} in
aarch64-linux-android) aarch64-linux-android)
./flutter/ndk_arm64.sh ./flutter/ndk_arm64.sh