From 02768026ca6ad4e7a192487d133d21cbce860585 Mon Sep 17 00:00:00 2001
From: Adam Novak <interfect@gmail.com>
Date: Sun, 8 Nov 2020 17:26:59 -0800
Subject: [PATCH] Get the actually-missing version, in all the steps that need
 it

---
 .github/workflows/android-build-pr.yml   | 2 ++
 .github/workflows/release-automation.yml | 2 ++
 .travis.yml                              | 2 +-
 automation/iceraven/install-sdk.sh       | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/android-build-pr.yml b/.github/workflows/android-build-pr.yml
index 2c5f9175c..96bfa3d2a 100644
--- a/.github/workflows/android-build-pr.yml
+++ b/.github/workflows/android-build-pr.yml
@@ -16,6 +16,8 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 11
+      - name: Install Android SDK with pieces Gradle skips
+        run: ./automation/iceraven/install-sdk.sh
       - name: Create version name
         run: echo "VERSION_NAME=$(git describe --tags HEAD)" >> $GITHUB_ENV
       - name: Build forkRelease variant of app
diff --git a/.github/workflows/release-automation.yml b/.github/workflows/release-automation.yml
index 03505fefa..fa873bdce 100644
--- a/.github/workflows/release-automation.yml
+++ b/.github/workflows/release-automation.yml
@@ -15,6 +15,8 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 11
+      - name: Install Android SDK with pieces Gradle skips
+        run: ./automation/iceraven/install-sdk.sh
       - name: Build forkRelease variant of app
         uses: eskatos/gradle-command-action@v1
         with:
diff --git a/.travis.yml b/.travis.yml
index 9eb4b500e..66e5d32a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ script:
   - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" | sudo tee -a /usr/local/android-sdk/licenses/android-sdk-license
   - echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" | sudo tee -a /usr/local/android-sdk/licenses/android-sdk-license
   # The build needs this but Gradle refuses to fetch it.
-  - sdkmanager "ndk;21.3.6528147"
+  - sdkmanager "ndk;21.0.6113669"
   # Run tests
   - ./gradlew -q testDebug 2>&1
   # Make sure a release build builds
diff --git a/automation/iceraven/install-sdk.sh b/automation/iceraven/install-sdk.sh
index 5ee9c74c9..be35ca67b 100755
--- a/automation/iceraven/install-sdk.sh
+++ b/automation/iceraven/install-sdk.sh
@@ -19,7 +19,7 @@ popd
 export ANDROID_SDK_ROOT=$HOME/android-sdk/android-sdk-linux/
 
 # Install the weirdly missing NDK
-${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager "ndk;21.3.6528147"
+${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager "ndk;21.0.6113669"
 
 # Point the build at the tools
 echo "sdk.dir=${ANDROID_SDK_ROOT}" >> local.properties