2
0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-11 13:11:01 +00:00

Get the actually-missing version, in all the steps that need it

This commit is contained in:
Adam Novak 2020-11-08 17:26:59 -08:00
parent 1c29b6f439
commit 02768026ca
4 changed files with 6 additions and 2 deletions

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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