chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get minimum aapt version from fdroidserver/common.py for CI tests
[fdroidserver.git]
/
.gitlab-ci.yml
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index afe030592b7992a49df05c0d6f68b8f242f5a358..063d150a5780650be89e3854fe6f02d4e5edc2a6 100644
(file)
--- a/
.gitlab-ci.yml
+++ b/
.gitlab-ci.yml
@@
-105,6
+105,7
@@
fedora_latest:
- wget --no-verbose -O tools.zip https://dl.google.com/android/repository/tools_r25.2.4-linux.zip
- unzip -q tools.zip
- rm tools.zip
- wget --no-verbose -O tools.zip https://dl.google.com/android/repository/tools_r25.2.4-linux.zip
- unzip -q tools.zip
- rm tools.zip
+ - export AAPT_VERSION=`sed -n "s,^MINIMUM_AAPT_VERSION\s*=\s*['\"]\(.*\)[['\"],\1,p" fdroidserver/common.py`
- export ANDROID_HOME=`pwd`/android-sdk
- mkdir $ANDROID_HOME
- mv tools $ANDROID_HOME/
- export ANDROID_HOME=`pwd`/android-sdk
- mkdir $ANDROID_HOME
- mv tools $ANDROID_HOME/
@@
-115,7
+116,7
@@
fedora_latest:
- mkdir ~/.android
- touch ~/.android/repositories.cfg
- echo y | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools"
- mkdir ~/.android
- touch ~/.android/repositories.cfg
- echo y | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools"
- - echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;
26.0.2
"
+ - echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;
$AAPT_VERSION
"
- chown -R testuser .
- cd tests
- su testuser --login --command
- chown -R testuser .
- cd tests
- su testuser --login --command