misc fixes

This commit is contained in:
linsui 2024-10-12 22:27:19 +08:00
parent a733b88085
commit d42d7ca9e1
4 changed files with 2 additions and 66 deletions

View file

@ -14417,21 +14417,6 @@ Builds:
scandelete:
- app/src/androidTest/assets
- versionName: '20241011'
versionCode: 20241011
commit: e7a2149a1aa804092c7b43a6dbcbb8c069672a0b
subdir: app
gradle:
- versionDev
rm:
- user_manual
prebuild:
- mkdir -p $HOME/.gradle
- echo "org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError"
> $HOME/.gradle/gradle.properties
scandelete:
- app/src/androidTest/assets
- versionName: '20241012'
versionCode: 20241012
commit: 95de7a974112d6d1d083693cd9ca036a08b93159

View file

@ -44,7 +44,6 @@ Builds:
subdir: app
gradle:
- free
prebuild: git reset --soft b62a80d361386d78ca34074059c418eed8400448
AllowedAPKSigningKeys: 82388e2f32b1160bd9613225018785c3cb93cb728d35e4dd6b962b008557b2ac

View file

@ -982,32 +982,9 @@ Builds:
- fdroid
prebuild: sed -i -e '/enable true/d' build.gradle
- versionName: 0.92.1
versionCode: 406
disable: https://github.com/vitorpamplona/amethyst/issues/1113
commit: 6d4ba6d5076945fc070a50aefca3e99e8e428587
subdir: amethyst
sudo:
- apt-get update
- apt-get install -y automake autogen libtool gettext-base autopoint make g++
pkg-config
gradle:
- fdroid
srclibs:
- tor-android@0de17c1863c3e0c0a49fdf8ad7ed341d69534492
prebuild:
- sed -i -e '/githubusercontent/d' -e '/repositories {/a mavenLocal()' ../settings.gradle
- sed -i -e '/enable true/d' -e '/googleServices/d' {..,.}/build.gradle
build:
- pushd $$tor-android$$
- ./tor-droid-make.sh build -b release | tee tor-android.log >/dev/null ; tail
-n 100 tor-android.log
- gradle :tor-android-binary:publishToMavenLocal
- popd
ndk: r25c
- versionName: 0.92.2
versionCode: 407
disable: https://github.com/vitorpamplona/amethyst/issues/1113
commit: b4eba2da026823a3ed3a9454e9b345668e917053
subdir: amethyst
sudo:
@ -1034,7 +1011,7 @@ AllowedAPKSigningKeys: c2d0aa86bcb6b62090561a41bbe336e98b78c2d0210a498dc885f28e1
MaintainerNotes: see https://gitlab.com/fdroid/fdroiddata/-/issues/2973#note_1428295385
on NonFreeNet
AutoUpdateMode: Version
AutoUpdateMode: None
UpdateCheckMode: Tags
CurrentVersion: 0.92.2
CurrentVersionCode: 407

View file

@ -3333,31 +3333,6 @@ Builds:
- cd ../../daemon/bin/jni
- PACKAGEDIR=../../../jami-android/libjamiclient/src/main/java ./make-swig.sh
- versionName: 20240926-01
versionCode: 431
commit: d428763b26f3e1bf9bf2001a0ec2de26299398ee
timeout: 10800
subdir: jami-android/app
submodules: true
sudo:
- apt-get update
- apt-get install -y automake autopoint bzip2 cmake g++ gettext libtool libyaml-cpp-dev
make pkg-config python-is-python3 yasm
- echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
- apt-get update
- apt-get install -y -t trixie swig
gradle:
- withUnifiedPush
prebuild:
- sed -i -e "/android {/a lint { abortOnError = false }" build.gradle.kts
- sed -i -e '/gms/d' ../build.gradle.kts
scandelete:
- daemon/contrib/src/*/package.json
- daemon/compat/msvc/package.json
build:
- cd ../../daemon/bin/jni
- PACKAGEDIR=../../../jami-android/libjamiclient/src/main/java ./make-swig.sh
- versionName: 20241011-01
versionCode: 432
commit: 5f52a526d80332f28355a75f09325f9d35c04658