misc fixes

This commit is contained in:
linsui 2024-08-25 14:21:58 +08:00
parent 4ca8b27441
commit 8bfed5adc3
9 changed files with 19 additions and 274 deletions

View file

@ -76,6 +76,7 @@ Builds:
- versionName: 0.8.5
versionCode: 62
disable: https://github.com/michaelWuensch/BitBanana/issues/92
commit: 86e38d36c519e5306a72bfbcf808d487c65828ee
subdir: app
gradle:

View file

@ -3720,190 +3720,6 @@ Builds:
scripts/ndk-make.sh x86_64
ndk: r23c
- versionName: 1.46.8
versionCode: 6911
disable: https://github.com/deltachat/deltachat-android/issues/3217
commit: f3661e4bc5a1c72a180ce0a09ae174a7c1d3e691
timeout: 20000
submodules: true
sudo:
- apt-get update
- apt-get install -y make g++ cmake
gradle:
- foss
srclibs:
- rustup@1.25.1
prebuild: sed -i -e '/versionCode/s/$/1/' -e 's/abiFilters .*/abiFilters "armeabi-v7a"/'
build.gradle
build:
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target armv7-linux-androideabi
- source $HOME/.cargo/env
- PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$
scripts/ndk-make.sh armeabi-v7a
ndk: r23c
- versionName: 1.46.8
versionCode: 6912
disable: https://github.com/deltachat/deltachat-android/issues/3217
commit: f3661e4bc5a1c72a180ce0a09ae174a7c1d3e691
timeout: 20000
submodules: true
sudo:
- apt-get update
- apt-get install -y make g++ cmake
gradle:
- foss
srclibs:
- rustup@1.25.1
prebuild: sed -i -e '/versionCode/s/$/2/' -e 's/abiFilters .*/abiFilters "arm64-v8a"/'
build.gradle
build:
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target aarch64-linux-android
- source $HOME/.cargo/env
- PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$
scripts/ndk-make.sh arm64-v8a
ndk: r23c
- versionName: 1.46.8
versionCode: 6913
disable: https://github.com/deltachat/deltachat-android/issues/3217
commit: f3661e4bc5a1c72a180ce0a09ae174a7c1d3e691
timeout: 20000
submodules: true
sudo:
- apt-get update
- apt-get install -y make g++ cmake
gradle:
- foss
srclibs:
- rustup@1.25.1
prebuild: sed -i -e '/versionCode/s/$/3/' -e 's/abiFilters .*/abiFilters "x86"/'
build.gradle
build:
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target i686-linux-android
- source $HOME/.cargo/env
- PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$
scripts/ndk-make.sh x86
ndk: r23c
- versionName: 1.46.8
versionCode: 6914
disable: https://github.com/deltachat/deltachat-android/issues/3217
commit: f3661e4bc5a1c72a180ce0a09ae174a7c1d3e691
timeout: 20000
submodules: true
sudo:
- apt-get update
- apt-get install -y make g++ cmake
gradle:
- foss
srclibs:
- rustup@1.25.1
prebuild: sed -i -e '/versionCode/s/$/4/' -e 's/abiFilters .*/abiFilters "x86_64"/'
build.gradle
build:
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target x86_64-linux-android
- source $HOME/.cargo/env
- PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$
scripts/ndk-make.sh x86_64
ndk: r23c
- versionName: 1.46.10
versionCode: 6921
disable: https://github.com/deltachat/deltachat-android/issues/1791
commit: 884b361349ff0faa19bb6ebbe321b08e53b001db
timeout: 20000
submodules: true
sudo:
- apt-get update
- apt-get install -y make g++ cmake
gradle:
- foss
srclibs:
- rustup@1.25.1
prebuild: sed -i -e '/versionCode/s/$/1/' -e 's/abiFilters .*/abiFilters "armeabi-v7a"/'
build.gradle
build:
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target armv7-linux-androideabi
- source $HOME/.cargo/env
- PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$
scripts/ndk-make.sh armeabi-v7a
ndk: r23c
- versionName: 1.46.10
versionCode: 6922
disable: https://github.com/deltachat/deltachat-android/issues/1791
commit: 884b361349ff0faa19bb6ebbe321b08e53b001db
timeout: 20000
submodules: true
sudo:
- apt-get update
- apt-get install -y make g++ cmake
gradle:
- foss
srclibs:
- rustup@1.25.1
prebuild: sed -i -e '/versionCode/s/$/2/' -e 's/abiFilters .*/abiFilters "arm64-v8a"/'
build.gradle
build:
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target aarch64-linux-android
- source $HOME/.cargo/env
- PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$
scripts/ndk-make.sh arm64-v8a
ndk: r23c
- versionName: 1.46.10
versionCode: 6923
disable: https://github.com/deltachat/deltachat-android/issues/1791
commit: 884b361349ff0faa19bb6ebbe321b08e53b001db
timeout: 20000
submodules: true
sudo:
- apt-get update
- apt-get install -y make g++ cmake
gradle:
- foss
srclibs:
- rustup@1.25.1
prebuild: sed -i -e '/versionCode/s/$/3/' -e 's/abiFilters .*/abiFilters "x86"/'
build.gradle
build:
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target i686-linux-android
- source $HOME/.cargo/env
- PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$
scripts/ndk-make.sh x86
ndk: r23c
- versionName: 1.46.10
versionCode: 6924
disable: https://github.com/deltachat/deltachat-android/issues/1791
commit: 884b361349ff0faa19bb6ebbe321b08e53b001db
timeout: 20000
submodules: true
sudo:
- apt-get update
- apt-get install -y make g++ cmake
gradle:
- foss
srclibs:
- rustup@1.25.1
prebuild: sed -i -e '/versionCode/s/$/4/' -e 's/abiFilters .*/abiFilters "x86_64"/'
build.gradle
build:
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target x86_64-linux-android
- source $HOME/.cargo/env
- PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$
scripts/ndk-make.sh x86_64
ndk: r23c
- versionName: 1.46.13
versionCode: 6951
commit: 27d060ee08aa408fc37e2e91496182077576c7c5

View file

@ -3518,40 +3518,6 @@ Builds:
- $$flutter$$/bin/flutter build apk --flavor fdroid --release
ndk: r25b
- versionName: 4.17.2
versionCode: 4283
commit: 5bdb87df05c058254f0097b89dae61b94ddbc75f
subdir: src/ui/flutter_app
output: build/app/outputs/flutter-apk/app-fdroid-release.apk
srclibs:
- flutter@stable
rm:
- src/test
- src/ui/flutter_app/ios
- src/ui/flutter_app/linux
- src/ui/flutter_app/macos
- src/ui/flutter_app/windows
- src/ui/flutter_app/test
- src/ui/qt
- tests
prebuild:
- export FLUTTER_VERSION=$(sed -n -E "s/.*flutter-version:\s'(.*)'/\1/p" ../../../.github/workflows/flutter.yml
| head -n 1)
- pushd $$flutter$$
- git checkout -f $FLUTTER_VERSION
- popd
- mv android/app/build.gradle_fdroid android/app/build.gradle
- export PUB_CACHE=$(pwd)/.pub-cache
- export PATH=$$flutter$$/bin:$PATH
- cd ../../..
- ./flutter-init.sh
scandelete:
- src/ui/flutter_app/.pub-cache
build:
- export PUB_CACHE=$(pwd)/.pub-cache
- $$flutter$$/bin/flutter build apk --flavor fdroid --release
ndk: r25b
- versionName: 4.17.3
versionCode: 4285
commit: e8d396dc3de1480cd31715dfebe662bde6af68ea

View file

@ -86,14 +86,6 @@ Builds:
- free
prebuild: sed -i -e '/firebase/d' -e '/gms.google/d' build.gradle.kts ../build.gradle.kts
- versionName: 2024.08.1034-dev
versionCode: 1034
commit: d4eb06229a74da90752a9579e31577a20d3fb19c
subdir: app
gradle:
- free
prebuild: sed -i -e '/firebase/d' -e '/gms.google/d' build.gradle.kts ../build.gradle.kts
- versionName: 2024.08.1035-dev
versionCode: 1035
commit: 27289daf195960d9d5272e631b47f502f928a3c2

View file

@ -500,13 +500,6 @@ Builds:
gradle:
- yes
- versionName: 2.0.1
versionCode: 93
commit: 0a4a49418746dff50376881aacd1eb5f10d5381e
subdir: app
gradle:
- yes
- versionName: 2.1.0
versionCode: 94
commit: 97e71c1b5fd01f1da432aba9951664beaeb6e795

View file

@ -47,16 +47,9 @@ Builds:
gradle:
- yes
- versionName: 1.3.75
versionCode: 8
commit: 1ab47b73a4993ec70220e7d33fec9f1e5a55c4f2
subdir: app
gradle:
- yes
AllowedAPKSigningKeys: fce87da97f791301df390bfa47e81685191167cab5dbd555db8287541f786e28
AutoUpdateMode: Version
UpdateCheckMode: Tags
CurrentVersion: 1.3.75
CurrentVersionCode: 8
UpdateCheckMode: Tags ^[\d.]+$
CurrentVersion: 1.3.5
CurrentVersionCode: 6

View file

@ -14208,24 +14208,9 @@ Builds:
scandelete:
- app/src/androidTest/assets
- versionName: '20240823'
versionCode: 20240823
commit: 6cdcea6ff9fc4b29858c8b427a83447b1f51fb31
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: '20240824'
versionCode: 20240824
commit: cda8e52cd59ba7bd93d062118adbd999e5e51785
- versionName: '20240825'
versionCode: 20240825
commit: 3d6cc7fb99de282721c019f1bd6cedfc3d2ce71a
subdir: app
gradle:
- versionDev
@ -14242,5 +14227,5 @@ MaintainerNotes: Tags get removed. See https://github.com/nextcloud/android/issu
AutoUpdateMode: Version
UpdateCheckMode: Tags ^dev
CurrentVersion: '20240824'
CurrentVersionCode: 20240824
CurrentVersion: '20240825'
CurrentVersionCode: 20240825

View file

@ -20,10 +20,9 @@ Builds:
gradle:
- free
- versionName: 1.0.1-free
versionCode: 42
disable: https://github.com/wbrawner/SimpleMarkdown/issues/89
commit: 50f0c299f502925f33196f30f0fa5259aaaf643b
- versionName: 1.0.2-free
versionCode: 44
commit: 0195e4ee586b5f21bb850af5dfd8329e989a388f
subdir: app
gradle:
- free
@ -34,5 +33,5 @@ Builds:
AutoUpdateMode: Version
UpdateCheckMode: Tags
UpdateCheckName: com.wbrawner.simplemarkdown
CurrentVersion: 1.0.1-free
CurrentVersionCode: 42
CurrentVersion: 1.0.2-free
CurrentVersionCode: 44

View file

@ -453,9 +453,9 @@ Builds:
postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
'META-INF/services/*'
- versionName: 0.6.49
versionCode: 51
commit: b43e0231db4049aebc434f10cd27dbf309575ffc
- versionName: 0.6.49.2
versionCode: 53
commit: 769745fabe86b26988d8622a096da87bc69e02fd
subdir: app
gradle:
- foss
@ -471,5 +471,5 @@ AllowedAPKSigningKeys: a1ba8bd74af8f92cb3719a072113a218cfaec02bce2b736a280e31d8c
AutoUpdateMode: Version
UpdateCheckMode: Tags
CurrentVersion: 0.6.49
CurrentVersionCode: 51
CurrentVersion: 0.6.49.2
CurrentVersionCode: 53