Ring: Try more generic fix, don't update to 20170531 (79)
This commit is contained in:
parent
7865fc4cef
commit
e87538a778
|
@ -414,20 +414,20 @@ Build:20170412,74
|
||||||
./compile.sh release
|
./compile.sh release
|
||||||
|
|
||||||
Build:20170501,76
|
Build:20170501,76
|
||||||
disable=builds locally, but not on server...
|
|
||||||
commit=628969d1bd199ccfcbcfbf4aae146fb261f4c6db
|
commit=628969d1bd199ccfcbcfbf4aae146fb261f4c6db
|
||||||
subdir=client-android/ring-android/app
|
subdir=client-android/ring-android/app
|
||||||
submodules=yes
|
submodules=yes
|
||||||
output=build/outputs/apk/app-release-unsigned.apk
|
output=build/outputs/apk/app-release-unsigned.apk
|
||||||
scandelete=client-windows,client-uwp
|
scandelete=client-windows,client-uwp
|
||||||
build=sed -i -e "/MissingTranslation/adisable 'ExtraTranslation'\n" build.gradle && \
|
build=export PATH=$PATH:/opt/gradle/bin && \
|
||||||
|
sed -i -e "/MissingTranslation/adisable 'ExtraTranslation'\n" build.gradle && \
|
||||||
ln -s ../daemon/ ../../ring-daemon && \
|
ln -s ../daemon/ ../../ring-daemon && \
|
||||||
echo -e '#!/bin/sh\ngradle "$@"' > ../gradlew && \
|
echo -e '#!/bin/sh\ngradle "$@"' > ../gradlew && \
|
||||||
export ANDROID_NDK_ROOT=$ANDROID_NDK && \
|
export ANDROID_NDK_ROOT=$ANDROID_NDK && \
|
||||||
export ANDROID_ABI="armeabi-v7a" && \
|
export ANDROID_ABI="armeabi-v7a" && \
|
||||||
cd ../../ && \
|
cd ../../ && \
|
||||||
./compile.sh release
|
./compile.sh release
|
||||||
ndk=r14
|
ndk=r14b
|
||||||
|
|
||||||
Build:20170516,78
|
Build:20170516,78
|
||||||
commit=fc2d83c
|
commit=fc2d83c
|
||||||
|
@ -444,6 +444,30 @@ Build:20170516,78
|
||||||
./compile.sh release
|
./compile.sh release
|
||||||
ndk=r14b
|
ndk=r14b
|
||||||
|
|
||||||
|
Build:20170531,79
|
||||||
|
disable=wait for test build 76
|
||||||
|
commit=79f748e3ea0354a7ba3e25d30a3e0178a16658d0
|
||||||
|
subdir=client-android/ring-android/app
|
||||||
|
submodules=yes
|
||||||
|
output=build/outputs/apk/app-release-unsigned.apk
|
||||||
|
scandelete=client-windows,client-uwp
|
||||||
|
build=export PATH=$PATH:/opt/gradle/bin && \
|
||||||
|
sed -i -e "/MissingTranslation/adisable 'ExtraTranslation'\n" build.gradle && \
|
||||||
|
ln -s ../daemon/ ../../ring-daemon && \
|
||||||
|
echo -e '#!/bin/sh\ngradle "$@"' > ../gradlew && \
|
||||||
|
export ANDROID_NDK_ROOT=$ANDROID_NDK && \
|
||||||
|
export ANDROID_ABI="armeabi-v7a" && \
|
||||||
|
cd ../../ && \
|
||||||
|
./compile.sh release
|
||||||
|
ndk=r14b
|
||||||
|
|
||||||
|
Maintainer Notes:
|
||||||
|
Looks like buildserver/setup-env-vars wasnt properly run the last time. PATH
|
||||||
|
should in fact already includee /opt/gradle:
|
||||||
|
|
||||||
|
echo 'export PATH=$PATH:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:/opt/gradle/bin' >> $bsenv
|
||||||
|
.
|
||||||
|
|
||||||
Auto Update Mode:None
|
Auto Update Mode:None
|
||||||
Update Check Mode:RepoManifest/production
|
Update Check Mode:RepoManifest/production
|
||||||
Current Version:20170531
|
Current Version:20170531
|
||||||
|
|
Loading…
Reference in a new issue