misc fixes

2026-05-07 22:56:56 +00:00 · 2021-07-14 21:55:47 +08:00 · 2021-07-14 21:55:47 +08:00 · caec1d323e
commit caec1d323e
parent 43d5d24493
6 changed files with 98 additions and 29 deletions
--- a/metadata/app.zeusln.zeus.yml
+++ b/metadata/app.zeusln.zeus.yml
@ -108,6 +108,68 @@ Builds:
      - mv sifir-rs-sdk/sifir-android/app/tor/build/outputs/aar/tor-release.aar node_modules/react-native-tor/android/libs/sifir_android.aar
    ndk: r21e

+  - versionName: 0.5.2
+    versionCode: 25
+    commit: v0.5.2
+    subdir: android/app
+    sudo:
+      - sysctl fs.inotify.max_user_watches=524288
+      - apt-get update || apt-get update
+      - apt-get install -y g++
+      - apt-get install -y -t stretch-backports npm
+    gradle:
+      - yes
+    output: build/outputs/apk/release/app-universal-release-unsigned.apk
+    srclibs:
+      - rustup@1.24.3
+      - sifir-rs-sdk@ef6de5f0d37528ce74addbd3dc2178998d7dec00
+    prebuild:
+      - echo -e '\n' 'org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError
+        -Dfile.encoding=UTF-8' >> ../gradle.properties
+      - cd ../..
+      - npm install
+      - npm run postinstall
+      - npm run patch-android-release
+      - cp -r $$sifir-rs-sdk$$ .
+    scanignore:
+      - android/build.gradle
+      - node_modules/jsc-android
+      - node_modules/v8-android
+      - node_modules/react-native/android
+      - node_modules/react-native-v8/dist/com/facebook/react/react-native
+      - node_modules/react-native/template/android/build.gradle
+      - node_modules/react-native-gesture-handler/android/lib/build.gradle
+      - node_modules/react-native-permissions/android/build.gradle
+      - node_modules/react-native-reanimated/android/build.gradle
+      - node_modules/react-native-safe-area-context/android/build.gradle
+      - node_modules/react-native-screens/android/build.gradle
+      - node_modules/react-native-secure-key-store/example/android/build.gradle
+      - node_modules/react-native-svg/android/build.gradle
+      - node_modules/react-native-tor/android/build.gradle
+      - node_modules/react-native-vector-icons/android/build.gradle
+      - node_modules/@react-native-community/async-storage/android/build.gradle
+      - node_modules/@react-native-community/masked-view/android/build.gradle
+      - node_modules/@react-navigation/native/node_modules/react-native-screens/android/build.gradle
+    scandelete:
+      - node_modules
+      - sifir-rs-sdk
+    build:
+      - $$rustup$$/rustup-init.sh -y
+      - source $HOME/.cargo/env
+      - rustup default stable
+      - rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
+        i686-linux-android
+      - cargo install cargo-ndk
+      - export ANDROID_NDK=$$NDK$$
+      - cd ../../sifir-rs-sdk/sifir-android
+      - cargo ndk --platform 30 -t arm64-v8a -t armeabi-v7a -t x86 -t x86_64 -o app/tor/src/main/jniLibs
+        build -p sifir-android --release
+      - cd app
+      - gradle assembleRelease
+      - cd ../../..
+      - mv sifir-rs-sdk/sifir-android/app/tor/build/outputs/aar/tor-release.aar node_modules/react-native-tor/android/libs/sifir_android.aar
+    ndk: r21e
+
 AutoUpdateMode: None
 UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.2
--- a/metadata/ch.admin.bag.covidcertificate.verifier.yml
+++ b/metadata/ch.admin.bag.covidcertificate.verifier.yml
@ -44,22 +44,9 @@ Builds:
    prebuild: printf '\nbuildTimestamp=%s\n' "$(curl -sL https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v$$VERSION$$-$$VERCODE$$-verifier/verifier-prod-$$VERSION$$-$$VERCODE$$-buildtimestamp.txt
        | tr -cd '0-9')" >> gradle.properties

-  - versionName: 2.1.0
-    versionCode: 2100
-    commit: 25137e1c7435681c86d4835eb08b35bb51efd24a
-    subdir: verifier
-    submodules: true
-    gradle:
-      - prod
-    rm:
-      - sdk/sdk/testKeystore
-      - wallet/testKeystore
-      - verifier/testKeystore
-    prebuild: printf '\nbuildTimestamp=%s\n' "$(curl -sL https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v$$VERSION$$-$$VERCODE$$-verifier/verifier-prod-$$VERSION$$-$$VERCODE$$-buildtimestamp.txt
-        | tr -cd '0-9')" >> gradle.properties
-
  - versionName: 2.1.1
    versionCode: 2110
+    disable: https://github.com/admin-ch/CovidCertificate-App-Android/issues/206
    commit: 085cceaf9415b632d2236dd36b7da4e187157050
    subdir: verifier
    submodules: true
--- a/metadata/ch.admin.bag.covidcertificate.wallet.yml
+++ b/metadata/ch.admin.bag.covidcertificate.wallet.yml
@ -44,22 +44,9 @@ Builds:
    prebuild: printf '\nbuildTimestamp=%s\n' "$(curl -sL https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v$$VERSION$$-$$VERCODE$$-wallet/wallet-prod-$$VERSION$$-$$VERCODE$$-buildtimestamp.txt
        | tr -cd '0-9')" >> gradle.properties

-  - versionName: 2.1.0
-    versionCode: 2100
-    commit: 25137e1c7435681c86d4835eb08b35bb51efd24a
-    subdir: wallet
-    submodules: true
-    gradle:
-      - prod
-    rm:
-      - sdk/sdk/testKeystore
-      - wallet/testKeystore
-      - verifier/testKeystore
-    prebuild: printf '\nbuildTimestamp=%s\n' "$(curl -sL https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v$$VERSION$$-$$VERCODE$$-wallet/wallet-prod-$$VERSION$$-$$VERCODE$$-buildtimestamp.txt
-        | tr -cd '0-9')" >> gradle.properties
-
  - versionName: 2.1.1
    versionCode: 2110
+    disable: https://github.com/admin-ch/CovidCertificate-App-Android/issues/206
    commit: 085cceaf9415b632d2236dd36b7da4e187157050
    subdir: wallet
    submodules: true
--- a/metadata/com.greenaddress.greenbits_android_wallet.yml
+++ b/metadata/com.greenaddress.greenbits_android_wallet.yml
@ -1997,6 +1997,7 @@ Builds:

  - versionName: 3.6.3
    versionCode: 22000363
+    disable: build failed
    commit: 333ffa887a818c089873385bd6265811313899aa
    timeout: 25200
    sudo:
--- a/metadata/com.newsblur.yml
+++ b/metadata/com.newsblur.yml
@ -1398,6 +1398,38 @@ Builds:
      - echo 'package com.newsblur.activity;public class Premium extends NbActivity{}'
        > src/com/newsblur/activity/Premium.java

+  - versionName: 10.3.1
+    versionCode: 185
+    commit: 8c04480bc0009add60f6bb45890d3348b6195fb1
+    subdir: clients/android/NewsBlur
+    gradle:
+      - yes
+    rm:
+      - api
+      - apps
+      - clients/ios
+      - config
+      - docker
+      - documents
+      - flask
+      - logs
+      - media
+      - node
+      - r
+      - templates
+      - utils
+      - vendor
+      - '[_a-z]*.*'
+      - clients/android/NewsBlur/libs/*.jar
+      - clients/android/NewsBlur/buildtools/*.jar
+    prebuild:
+      - sed -i -e '/com.google.android.play/d' -e '/billingclient/d' build.gradle
+      - sed -i -e '/play.core/d' -e '/void checkInAppReview/,/^    }/d' -e '/checkInAppReview/d'
+        -e '/void onBackPressed/a super.onBackPressed();}' -e '/reviewInfo != null/,/^    }/d'
+        -e '/Review/d' src/com/newsblur/activity/FeedItemsList.java
+      - echo 'package com.newsblur.activity;public class Premium extends NbActivity{}'
+        > src/com/newsblur/activity/Premium.java
+
 AutoUpdateMode: None
 UpdateCheckMode: RepoManifest
 CurrentVersion: 10.3.1
--- a/metadata/com.shabinder.spotiflyer.yml
+++ b/metadata/com.shabinder.spotiflyer.yml
@ -38,7 +38,7 @@ Builds:

  - versionName: 3.2.1
    versionCode: 22
-    commit: c4a3d4f348df48effeadd24072766ad3e95aef81
+    commit: 116530cc3c6b5b89a58991aefeedd7d126bad776
    subdir: android
    sudo:
      - apt-get update || apt-get update