From 51de9b72cf4b2ecac44caeb69aae3fd1932a4f78 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Thu, 19 Nov 2020 12:24:03 -0800 Subject: [PATCH] Fix GitHub Actions for sample build (#1693) Summary: Honestly not sure what's causing the new NDK to be pulled in but at least locally installing it fixes the failure we see here: https://github.com/facebook/flipper/runs/1424681947 Pull Request resolved: https://github.com/facebook/flipper/pull/1693 Test Plan: Wait for the Actions on the PR Reviewed By: nikoant Differential Revision: D25093335 Pulled By: passy fbshipit-source-id: e7af63fcf3c5270c869acc3d094234d15968aeda --- .github/workflows/android-sample.yml | 4 ++-- .github/workflows/android.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/android-sample.yml b/.github/workflows/android-sample.yml index b5259347d..ca55e5923 100644 --- a/.github/workflows/android-sample.yml +++ b/.github/workflows/android-sample.yml @@ -13,8 +13,8 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - - name: Install NDK 20 - run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT} + - name: Install NDK 21 + run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT} - name: Build with Gradle run: ./gradlew :sample:assembleDebug :tutorial:assembleDebug - name: upload artifact diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 20fe8cbc9..ec9776399 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -15,8 +15,8 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - - name: Install NDK 20 - run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT} + - name: Install NDK 21 + run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT} - name: Build with Gradle run: ./gradlew :sample:assembleDebug :sample:assembleRelease - name: Rename apk