Merge branch 'miscupdates' into 'master'

FairEmail & OMW_Nightly

See merge request fdroid/fdroiddata!8470

metadata/eu.faircode.email.yml

@@ -3718,9 +3718,19 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21d
 
+  - versionName: '1.1515'
+    versionCode: 1515
+    commit: '1.1515'
+    subdir: app
+    submodules: true
+    gradle:
+      - fdroid
+    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
+    ndk: r21d
+
 MaintainerNotes: Dynamic versionName and version code, so no autoupdates anymore.
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '1.1492'
-CurrentVersionCode: 1492
+CurrentVersion: '1.1515'
+CurrentVersionCode: 1515

metadata/is.xyz.omw_nightly.yml

@@ -579,6 +579,41 @@ Builds:
       - buildscripts/downloads/*
     ndk: r20b
 
+  - versionName: 0.47.0-43-nightly
+    versionCode: 43
+    commit: 0.47.0-43-nightly
+    timeout: 30000
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y doxygen g++ pkgconf wget
+      - apt-get install -y -t stretch-backports-sloppy libarchive13
+      - apt-get install -y -t stretch-backports cmake
+    gradle:
+      - nightly
+    output: app/build/outputs/apk/nightly/release/omw_release_*.apk
+    prebuild:
+      - sed -i -e '/Unzip/,+5d' buildscripts/include/setup-ndk.sh
+      - sed -i -e 's/\ -Wl,-plugin-opt=-emulated-tls//' -e '/download-ndk/d' -e '/debugging\
+        life/,+19d' buildscripts/build.sh
+      - mkdir -p buildscripts/toolchain/ndk
+      - ln -s $$NDK$$/* buildscripts/toolchain/ndk/
+      - rm -fr buildscripts/toolchain/ndk/build
+      - cp -r $$NDK$$/build buildscripts/toolchain/ndk/
+      - sed -i 's/Oz/O2/g' buildscripts/toolchain/ndk/build/cmake/android.toolchain.cmake
+      - ./buildscripts/build.sh --arch arm --lto
+      - ./buildscripts/build.sh --arch arm64 --lto --no-resources
+      - ./buildscripts/build.sh --arch x86 --lto --no-resources
+      - ./buildscripts/build.sh --arch x86_64 --lto --no-resources
+      - rm -fr ./buildscripts/build/*
+      - rm -fr ./buildscripts/prefix/*
+      - rm -fr ./buildscripts/symbols/*
+      - rm -fr ./buildscripts/toolchain/*
+    scanignore:
+      - app/src/main/assets
+      - app/src/main/jniLibs
+      - buildscripts/downloads/*
+    ndk: r20b
+
 MaintainerNotes: |-
     - we use prebuild else fdroid scanner will detect the built libs as binaries on the second pass before running build, and we can't scanignore them (at start) since they don't exist yet, see https://gitlab.com/fdroid/fdroidserver/issues/635
     - we remove the buildtools and intermediary artefacts (several gigabytes) else they'll get pulled in the source tarball