cache and fix android env
This commit is contained in:
+5
-1
@@ -4,9 +4,13 @@ build-android:
|
|||||||
apt update && apt install -y openjdk-17-jdk-headless unzip curl rsync patch
|
apt update && apt install -y openjdk-17-jdk-headless unzip curl rsync patch
|
||||||
/usr/lib/jvm/java-17-openjdk-amd64/bin/java --version
|
/usr/lib/jvm/java-17-openjdk-amd64/bin/java --version
|
||||||
mkdir -p ~/.ssh && ssh-keyscan -p 22 -t rsa,ed25519 git.inker.bot >> ~/.ssh/known_hosts
|
mkdir -p ~/.ssh && ssh-keyscan -p 22 -t rsa,ed25519 git.inker.bot >> ~/.ssh/known_hosts
|
||||||
|
cache:
|
||||||
|
- paths:
|
||||||
|
- $HOME/.gradle
|
||||||
|
- $HOME/go
|
||||||
script: |
|
script: |
|
||||||
export version="$(git describe --tags)-$CI_COMMIT_SHORT_SHA" && echo "building version $version"
|
export version="$(git describe --tags)-$CI_COMMIT_SHORT_SHA" && echo "building version $version"
|
||||||
bash ./setup-ndk.sh
|
bash ./setup-ndk.sh && source ./android.env
|
||||||
bin/update && bin/apply-ci && cd works/core
|
bin/update && bin/apply-ci && cd works/core
|
||||||
git submodule update --init --recursive
|
git submodule update --init --recursive
|
||||||
git tag v$version -f
|
git tag v$version -f
|
||||||
|
|||||||
+7
-1
@@ -21,4 +21,10 @@ sdkmanager \
|
|||||||
"build-tools;34.0.0" \
|
"build-tools;34.0.0" \
|
||||||
"ndk;28.0.12433566"
|
"ndk;28.0.12433566"
|
||||||
|
|
||||||
export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/28.0.12433566"
|
export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/28.0.12433566"
|
||||||
|
|
||||||
|
echo "
|
||||||
|
ANDROID_HOME=$ANDROID_HOME
|
||||||
|
ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT
|
||||||
|
ANDROID_NDK_HOME=$ANDROID_NDK_HOME
|
||||||
|
" > android.env
|
||||||
Reference in New Issue
Block a user