Merge remote-tracking branch 'origin/dev' into bugfix-watchtower

KomodoPlatform · Oct 25, 2023 · 90853f8 · 90853f8
2 parents edf9ba1 + 3e323df
commit 90853f8
Show file tree

Hide file tree

Showing 114 changed files with 10,164 additions and 2,692 deletions.
diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
@@ -374,7 +374,7 @@ jobs:
           rustup target add aarch64-linux-android
 
       - name: Setup NDK
-        run: ./scripts/ci/android-ndk.sh x86 21
+        run: ./scripts/ci/android-ndk.sh x86 23
 
       - name: Calculate commit hash for PR commit
         if: github.event_name == 'pull_request'
@@ -440,7 +440,7 @@ jobs:
           rustup target add armv7-linux-androideabi
 
       - name: Setup NDK
-        run: ./scripts/ci/android-ndk.sh x86 21
+        run: ./scripts/ci/android-ndk.sh x86 23
 
       - name: Calculate commit hash for PR commit
         if: github.event_name == 'pull_request'

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -336,7 +336,7 @@ jobs:
           rustup target add aarch64-linux-android
 
       - name: Setup NDK
-        run: ./scripts/ci/android-ndk.sh x86 21
+        run: ./scripts/ci/android-ndk.sh x86 23
 
       - name: Calculate commit hash for PR commit
         if: github.event_name == 'pull_request'
@@ -396,7 +396,7 @@ jobs:
           rustup target add armv7-linux-androideabi
 
       - name: Setup NDK
-        run: ./scripts/ci/android-ndk.sh x86 21
+        run: ./scripts/ci/android-ndk.sh x86 23
 
       - name: Calculate commit hash for PR commit
         if: github.event_name == 'pull_request'