From d73800267702c38dc6e77dd9ea093eb7f4750581 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sat, 29 Aug 2026 00:04:59 +0100
Subject: [PATCH] build the x64 and arm64 together, in the same apk

---
 .forgejo/workflows/release.yml | 41 +++++++++++++---------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml
index 22b14232..0b909b01 100644
--- a/.forgejo/workflows/release.yml
+++ b/.forgejo/workflows/release.yml
@@ -177,7 +177,15 @@ jobs:
 
         run: |
           cd /src/_src
-          dotnet build yavsc.sln -c Release --no-restore -clp:ErrorsOnly
+          dotnet restore
+          dotnet build src/Yavsc.Org/Yavsc.Org.csproj \
+           -c Release --no-restore -clp:ErrorsOnly
+          dotnet build src/Yavsc.Api/Yavsc.Api.csproj \
+           -c Release --no-restore -clp:ErrorsOnly
+          dotnet build src/Yavsc.Blogs/Yavsc.Blogs.csproj \
+           -c Release --no-restore -clp:ErrorsOnly
+          dotnet build src/PostIt/PostIt.Android/PostIt.Android.csproj \
+           -c Release --no-restore -clp:ErrorsOnly
 
       - name: Copier les APK signés vers un emplacement connu
         # Le build Android avec -r android-arm64 produit l'APK dans
@@ -185,22 +193,13 @@ jobs:
         # la racine du checkout pour que l'étape d'upload le trouve.
         run: |
           cd /src/_src
-          ARMAPK=src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/fr.pschneider.postit-Signed.apk
-          if [[ ! -f "$ARMAPK" ]]; then
-            echo "::error::ARMAPK not found at $ARMAPK"
-            ls -la src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64 2>/dev/null || true
+          APK=src/PostIt/PostIt.Android/bin/Release/net10.0-android/fr.pschneider.postit-Signed.apk
+          if [[ ! -f "$APK" ]]; then
+            echo "::error::APK not found at $APK"
+            ls -la src/PostIt/PostIt.Android/bin/Release/net10.0-android 2>/dev/null || true
             exit 1
           fi
-          cp "$ARMAPK" /src/_src/PostIt.Android-arm64.apk
-          XAPK=src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-x86_64/fr.pschneider.postit-Signed.apk
-          if [[ ! -f "$XAPK" ]]; then
-            echo "::error::XAPK not found at $XAPK"
-            ls -la src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-x86_64 2>/dev/null || true
-            exit 1
-          fi
-          cp "$XAPK" /src/_src/PostIt.Android-x86_64.apk
-          ls -la /src/_src/PostIt.Android-arm64.apk
-          ls -la /src/_src/PostIt.Android-x86_64.apk
+          cp "$APK" /src/_src/PostIt.Android.apk
 
       - name: Publier la release Forgejo via l'API REST
         # Pas d'action tierce (pas de Node dans l'image runner).
@@ -315,16 +314,8 @@ jobs:
             -H "Authorization: token $GITHUB_TOKEN" \
             -H "Content-Type: application/octet-stream" \
             -H "Accept: application/json" \
-            --data-binary "@/src/_src/PostIt.Android-arm64.apk" \
-            "$API_BASE/api/v1/repos/$GITHUB_REPOSITORY/releases/$RELEASE_ID/assets?name=PostIt.Android-arm64.apk")
-          echo "POST asset -> HTTP $HTTP"
-          HTTP=$(curl -sS -o /tmp/asset.json -w '%{http_code}' \
-            -X POST \
-            -H "Authorization: token $GITHUB_TOKEN" \
-            -H "Content-Type: application/octet-stream" \
-            -H "Accept: application/json" \
-            --data-binary "@/src/_src/PostIt.Android-x86_64.apk" \
-            "$API_BASE/api/v1/repos/$GITHUB_REPOSITORY/releases/$RELEASE_ID/assets?name=PostIt.Android-x86_64.apk")
+            --data-binary "@/src/_src/PostIt.Android.apk" \
+            "$API_BASE/api/v1/repos/$GITHUB_REPOSITORY/releases/$RELEASE_ID/assets?name=PostIt.Android.apk")
           echo "POST asset -> HTTP $HTTP"
 
           echo "::endgroup::"