Merge pull request #3602 from Kingtous/master

fix: upgrade ndk version to r23
This commit is contained in:
RustDesk
2023-03-11 12:51:13 +08:00
committed by GitHub
2 changed files with 5 additions and 3 deletions

View File

@@ -23,6 +23,7 @@ env:
# for multiarch gcc compatibility # for multiarch gcc compatibility
VCPKG_COMMIT_ID: "14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44" VCPKG_COMMIT_ID: "14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44"
VERSION: "1.2.0" VERSION: "1.2.0"
NDK_VERSION: "r23"
jobs: jobs:
build-for-windows: build-for-windows:
@@ -354,7 +355,7 @@ jobs:
- uses: nttld/setup-ndk@v1 - uses: nttld/setup-ndk@v1
id: setup-ndk id: setup-ndk
with: with:
ndk-version: r22b ndk-version: ${{ env.NDK_VERSION }}
add-to-path: true add-to-path: true
- name: Download deps - name: Download deps

View File

@@ -14,6 +14,7 @@ env:
# for multiarch gcc compatibility # for multiarch gcc compatibility
VCPKG_COMMIT_ID: "14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44" VCPKG_COMMIT_ID: "14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44"
VERSION: "1.2.0" VERSION: "1.2.0"
NDK_VERSION: "r23"
#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 }}'
@@ -430,7 +431,7 @@ jobs:
- { - {
arch: x86_64, arch: x86_64,
target: aarch64-linux-android, target: aarch64-linux-android,
os: ubuntu-18.04, os: ubuntu-20.04,
extra-build-features: "", extra-build-features: "",
} }
# - { # - {
@@ -454,7 +455,7 @@ jobs:
- uses: nttld/setup-ndk@v1 - uses: nttld/setup-ndk@v1
id: setup-ndk id: setup-ndk
with: with:
ndk-version: r22b ndk-version: ${{ env.NDK_VERSION }}
add-to-path: true add-to-path: true
- name: Download deps - name: Download deps