diff --git a/.github/workflows/diffuse.yml b/.github/workflows/diffuse.yml index 99954ce8c3..a444963871 100644 --- a/.github/workflows/diffuse.yml +++ b/.github/workflows/diffuse.yml @@ -7,6 +7,9 @@ permissions: contents: read # to fetch code (actions/checkout) pull-requests: write # to comment on PR +env: + NDK_VERSION: '27.0.12077973' + jobs: assemble-base: if: ${{ github.repository != 'signalapp/Signal-Android' }} @@ -25,6 +28,9 @@ jobs: java-version: 17 cache: gradle + - name: Install NDK + run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.NDK_VERSION }}" + - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 @@ -35,7 +41,6 @@ jobs: path: diffuse-base.apk key: diffuse-${{ github.event.pull_request.base.sha }} - - name: Build with Gradle if: steps.cache-base.outputs.cache-hit != 'true' run: ./gradlew assemblePlayProdRelease @@ -70,7 +75,7 @@ jobs: - uses: peter-evans/create-or-update-comment@v3 with: body: | - Diffuse output: + Diffuse output: ${{ steps.diffuse.outputs.diff-gh-comment }} edit-mode: replace diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts index ea2aef5458..39fec952b0 100644 --- a/dependencies.gradle.kts +++ b/dependencies.gradle.kts @@ -127,7 +127,7 @@ dependencyResolutionManagement { library("libsignal-client", "org.signal", "libsignal-client").versionRef("libsignal-client") library("libsignal-android", "org.signal", "libsignal-android").versionRef("libsignal-client") library("signal-aesgcmprovider", "org.signal:aesgcmprovider:0.0.3") - library("signal-ringrtc", "org.signal:ringrtc-android:2.48.0") + library("signal-ringrtc", "org.signal:ringrtc-android:2.48.1") library("signal-android-database-sqlcipher", "org.signal:sqlcipher-android:4.6.0-S1") // Third Party diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 7a0319e153..78075e5a3d 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -9013,12 +9013,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - + + + - - + +