From 477a1b7eeb90e4caf3abecec10e826c09ede2f8b Mon Sep 17 00:00:00 2001
From: shum <shum@liber.li>
Date: Sat, 13 Apr 2024 15:03:08 +0000
Subject: [PATCH] chat.simplex.app: armv7a build fixes and cleanup

---
 metadata/chat.simplex.app.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/metadata/chat.simplex.app.yml b/metadata/chat.simplex.app.yml
index da00a0dd53..d845d03202 100644
--- a/metadata/chat.simplex.app.yml
+++ b/metadata/chat.simplex.app.yml
@@ -1120,7 +1120,6 @@ Builds:
 
   - versionName: 5.6.1
     versionCode: 193
-    disable: git checkout
     commit: ea6c5bfb0bc5276cf666ed9f0c96ae1613583aca
     timeout: 30000
     sudo:
@@ -1129,6 +1128,7 @@ Builds:
       - mkdir -m 0755 /nix
       - chown vagrant /nix
       - chown -R vagrant /tmp
+    init: git checkout v$$VERSION$$-armv7a
     output: ./simplex-chat-armeabi-v7a.apk
     rm:
       - ./docs/themes/simplex-chat.sample.zip
@@ -1136,8 +1136,9 @@ Builds:
       - cp -r ./apps/multiplatform/gradle .
       - sed -i -e '/maven.pkg.jetbrains.space/d' ./apps/multiplatform/{build,settings}.gradle.kts
       - sed -i -e '/gradleConfig/d' ./apps/multiplatform/android/build.gradle.kts
+      - sed -i -e 's/git checkout.*/:/' ./scripts/android/build-android.sh
+      - sed -i -e 's/.*commit.*/:/' ./scripts/android/build-android.sh
       - sed -i -e 's/android.version_code=.*/android.version_code=$$VERCODE$$/' ./apps/multiplatform/gradle.properties
-      - sed -i -e 's/HEAD/& | head -n1/' ./scripts/android/build-android.sh
     build:
       - gradle -v
       - export USER=vagrant
@@ -1145,7 +1146,6 @@ Builds:
 
   - versionName: 5.6.1
     versionCode: 194
-    disable: git checkout
     commit: ea6c5bfb0bc5276cf666ed9f0c96ae1613583aca
     timeout: 60000
     sudo:
@@ -1162,10 +1162,6 @@ Builds:
       - sed -i -e '/maven.pkg.jetbrains.space/d' ./apps/multiplatform/{build,settings}.gradle.kts
       - sed -i -e '/gradleConfig/d' ./apps/multiplatform/android/build.gradle.kts
       - sed -i -e 's/android.version_code=.*/android.version_code=$$VERCODE$$/' ./apps/multiplatform/gradle.properties
-      - sed -i -e 's/android_simplex_lib=.*/android_simplex_lib="${folder}#hydraJobs.x86_64-linux.${arch}-android:lib:simplex-chat"/g'
-        -e 's/android_support_lib=.*/android_support_lib="${folder}#hydraJobs.x86_64-linux.${arch}-android:lib:support"/g'
-        ./scripts/android/build-android.sh
-      - sed -i -e 's/HEAD/& | head -n1/' ./scripts/android/build-android.sh
     build:
       - gradle -v
       - export USER=vagrant