From 55751671beaac41b9543a9ad9b03082874f7c775 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Wed, 25 May 2022 08:11:41 +0000 Subject: [PATCH] DeltaChat - disable one more build, cleanup disabled --- metadata/com.b44t.messenger.yml | 120 +------------------------------- 1 file changed, 1 insertion(+), 119 deletions(-) diff --git a/metadata/com.b44t.messenger.yml b/metadata/com.b44t.messenger.yml index dcaa97d0ec..0447d644cf 100644 --- a/metadata/com.b44t.messenger.yml +++ b/metadata/com.b44t.messenger.yml @@ -808,43 +808,6 @@ Builds: - ./ndk-make.sh ndk: r20b - - versionName: 1.10.4 - versionCode: 587 - disable: fails to build, rust-init.sh missing - commit: v1.10.4 - timeout: 20000 - submodules: true - gradle: - - fat - srclibs: - - rustup@1.21.1 - prebuild: sed -i -e '/applicationIdSuffix/d' build.gradle - build: - - cd jni/deltachat-core-rust - - ../../$$rustup$$/rustup-init.sh -y - - export PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ - - source $HOME/.cargo/env - - rustup default $(cat rust-toolchain) - - rustup target add aarch64-linux-android - - echo "[target.aarch64-linux-android]" > $HOME/.cargo/config - - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"' - >> $HOME/.cargo/config - - rustup target add i686-linux-android - - echo "[target.i686-linux-android]" >> $HOME/.cargo/config - - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android18-clang"' - >> $HOME/.cargo/config - - rustup target add armv7-linux-androideabi - - echo "[target.armv7-linux-androideabi]" >> $HOME/.cargo/config - - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi18-clang"' - >> $HOME/.cargo/config - - rustup target add x86_64-linux-android - - echo "[target.x86_64-linux-android]" >> $HOME/.cargo/config - - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"' - >> $HOME/.cargo/config - - cd ../.. - - ./ndk-make.sh - ndk: r20b - - versionName: 1.10.5 versionCode: 588 commit: v1.10.5 @@ -1355,6 +1318,7 @@ Builds: - versionName: 1.28.1 versionCode: 626 + disable: https://github.com/deltachat/deltachat-android/pull/2303 commit: d91d8c9ea3eca65fe0220723ebdbcfcceb4412c3 timeout: 20000 submodules: true @@ -1393,88 +1357,6 @@ Builds: - ./ndk-make.sh ndk: r20b - - versionName: 1.28.3 - versionCode: 628 - disable: https://github.com/deltachat/deltachat-android/pull/2303 - commit: 420f6fbbc4d1a5351802132f32503dca1864e8b3 - timeout: 20000 - submodules: true - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - fat - srclibs: - - rustup@1.21.1 - prebuild: sed -i -e '/applicationIdSuffix/d' build.gradle - build: - - cd jni/deltachat-core-rust - - $$rustup$$/rustup-init.sh -y - - export PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ - - source $HOME/.cargo/env - - rustup default $(cat rust-toolchain) - - rustup target add aarch64-linux-android - - echo "[target.aarch64-linux-android]" > $HOME/.cargo/config - - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"' - >> $HOME/.cargo/config - - rustup target add i686-linux-android - - echo "[target.i686-linux-android]" >> $HOME/.cargo/config - - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android18-clang"' - >> $HOME/.cargo/config - - rustup target add armv7-linux-androideabi - - echo "[target.armv7-linux-androideabi]" >> $HOME/.cargo/config - - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi18-clang"' - >> $HOME/.cargo/config - - rustup target add x86_64-linux-android - - echo "[target.x86_64-linux-android]" >> $HOME/.cargo/config - - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"' - >> $HOME/.cargo/config - - cd ../.. - - ./ndk-make.sh - ndk: r20b - - - versionName: 1.30.1 - versionCode: 630 - disable: https://github.com/deltachat/deltachat-android/pull/2303 - commit: 7cd60b2fc1a104b8fe032caad8e05e814fbe8b1e - timeout: 20000 - submodules: true - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - fat - srclibs: - - rustup@1.21.1 - prebuild: sed -i -e '/applicationIdSuffix/d' build.gradle - build: - - cd jni/deltachat-core-rust - - $$rustup$$/rustup-init.sh -y - - export PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ - - source $HOME/.cargo/env - - rustup default $(cat rust-toolchain) - - rustup target add aarch64-linux-android - - echo "[target.aarch64-linux-android]" > $HOME/.cargo/config - - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"' - >> $HOME/.cargo/config - - rustup target add i686-linux-android - - echo "[target.i686-linux-android]" >> $HOME/.cargo/config - - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android18-clang"' - >> $HOME/.cargo/config - - rustup target add armv7-linux-androideabi - - echo "[target.armv7-linux-androideabi]" >> $HOME/.cargo/config - - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi18-clang"' - >> $HOME/.cargo/config - - rustup target add x86_64-linux-android - - echo "[target.x86_64-linux-android]" >> $HOME/.cargo/config - - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"' - >> $HOME/.cargo/config - - cd ../.. - - ./ndk-make.sh - ndk: r20b - - versionName: 1.30.2 versionCode: 631 commit: 4664e51754079cf813e1f3b11848e3bd1f280b26