From 3d51ffc643b6189f85e35cd6cb3c8c322d9b427b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Cig=C3=A1nek?= Date: Wed, 23 Oct 2024 14:10:46 +0200 Subject: [PATCH] Downgrade NDK to 27.1.12297006 The latest one (27.2.12479018) causes compilation the ring crate for the arm target to fail on the CI (but not locally). --- .github/workflows/ci.yml | 22 ++++++++++++---------- bindings/dart/android/build.gradle | 3 +-- bindings/kotlin/lib/build.gradle | 4 +--- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 843d07993..c73f669d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,12 +108,12 @@ jobs: # the linux version does currently unconditionally depend on fuse. run: sudo apt-get install libfuse-dev - - name: Install NDK - uses: nttld/setup-ndk@v1 - with: - ndk-version: r27c - link-to-sdk: true - local-cache: true + # - name: Install NDK + # uses: nttld/setup-ndk@v1 + # with: + # ndk-version: r27c + # link-to-sdk: true + # local-cache: true - name: Cache cargo artifacts uses: actions/cache@v3 @@ -125,6 +125,8 @@ jobs: ~/.cargo/git/db/ target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }} + restore-keys: | + ${{ runner.os }}-cargo- - name: Cache gradle artifacts uses: actions/cache@v3 @@ -142,19 +144,19 @@ jobs: - name: Run spotless working-directory: bindings/kotlin - run: ./gradlew spotlessCheck + run: ./gradlew --stacktrace spotlessCheck - name: Run lint working-directory: bindings/kotlin - run: ./gradlew lint + run: ./gradlew --stacktrace lint - name: Run unit tests working-directory: bindings/kotlin - run: ./gradlew lib:testDebugUnitTest + run: ./gradlew --stacktrace lib:testDebugUnitTest - name: Build the example app working-directory: bindings/kotlin - run: ./gradlew example:assembleDebug + run: ./gradlew --stacktrace example:assembleDebug check_dart_bindings: name: check dart bindings diff --git a/bindings/dart/android/build.gradle b/bindings/dart/android/build.gradle index d69bf52f8..cac696885 100644 --- a/bindings/dart/android/build.gradle +++ b/bindings/dart/android/build.gradle @@ -36,8 +36,7 @@ android { } compileSdk = 34 - // At time of writing, this is the LTS version - ndkVersion = "27.2.12479018" + ndkVersion "27.1.12297006" compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/bindings/kotlin/lib/build.gradle b/bindings/kotlin/lib/build.gradle index 0dbdb760a..b17159f57 100644 --- a/bindings/kotlin/lib/build.gradle +++ b/bindings/kotlin/lib/build.gradle @@ -22,9 +22,7 @@ group = rootProject.group android { compileSdkVersion 34 - - // At time of writing, this is the LTS version - ndkVersion "27.2.12479018" + ndkVersion "27.1.12297006" namespace 'org.equalitie.ouisync.lib'