fix(cross): add & fix ios builder

Author: karimzakzouk

cross-platform/build.sh

@@ -22,6 +22,101 @@ else
   exit 1
 fi
 
+echo "🖥️  Detected OS: $OS_TYPE"
+
+# --- Trigger iOS builder FIRST on Ubuntu ---
+if [ "$OS_TYPE" = "ubuntu" ]; then
+  echo "🚀 Triggering iOS Flutter Builder workflow first..."
+  
+  # Install jq if needed (for JSON parsing)
+  if ! command -v jq &> /dev/null; then
+    echo "Installing jq..."
+    sudo apt-get install jq -y > /dev/null 2>&1
+  fi
+  
+  # Install GitHub CLI if needed
+  if ! command -v gh &> /dev/null; then
+    echo "Installing GitHub CLI..."
+    curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+    sudo apt-get update > /dev/null 2>&1
+    sudo apt-get install gh -y > /dev/null 2>&1
+  fi
+  
+  # Authenticate GitHub CLI
+  export GH_TOKEN="${GITHUB_PAT}"
+  
+  # Trigger iOS builder workflow
+  echo "📱 Triggering iOS build via flutter-ios-builder..."
+  gh api \
+    --method POST \
+    -H "Accept: application/vnd.github+json" \
+    -H "X-GitHub-Api-Version: 2022-11-28" \
+    /repos/${OWNER_NAME}/flutter-ios-builder/dispatches \
+    -f event_type='trigger-macos-build' \
+    -f client_payload[owner_name]="${OWNER_NAME}" \
+    -f client_payload[repo_name]="${REPO_NAME}" \
+    -f client_payload[branch]="${BRANCH}" \
+    -f client_payload[custom_tag]="${ENV_TAG}" \
+    -f client_payload[devops_owner]="${OWNER_NAME}" \
+    -f client_payload[devops_repo]="helm" \
+    -f client_payload[devops_branch]="${DEVOPS_BRANCH:-main}"
+  
+  if [ $? -ne 0 ]; then
+    echo "❌ Failed to trigger iOS builder workflow"
+    exit 1
+  fi
+  
+  echo "✅ iOS builder workflow triggered successfully"
+  
+  # Wait for workflow to complete
+  echo "⏳ Waiting for iOS build to complete..."
+  sleep 10
+  
+  MAX_WAIT=1800  # 30 minutes
+  ELAPSED=0
+  POLL_INTERVAL=30
+  
+  while [ $ELAPSED -lt $MAX_WAIT ]; do
+    WORKFLOW_STATUS=$(gh run list \
+      --repo "${OWNER_NAME}/flutter-ios-builder" \
+      --workflow "iOS Builder (macOS)" \
+      --branch "main" \
+      --limit 1 \
+      --json status,conclusion \
+      --jq '.[0]')
+    
+    if [ -z "$WORKFLOW_STATUS" ]; then
+      echo "⏳ Workflow not started yet, waiting..."
+    else
+      STATUS=$(echo "$WORKFLOW_STATUS" | jq -r '.status')
+      CONCLUSION=$(echo "$WORKFLOW_STATUS" | jq -r '.conclusion')
+      
+      if [ "$STATUS" = "completed" ]; then
+        if [ "$CONCLUSION" = "success" ]; then
+          echo "✅ iOS build completed successfully!"
+          break
+        else
+          echo "❌ iOS build failed with conclusion: $CONCLUSION"
+          exit 1
+        fi
+      else
+        echo "⏳ iOS build in progress (status: $STATUS)..."
+      fi
+    fi
+    
+    sleep $POLL_INTERVAL
+    ELAPSED=$((ELAPSED + POLL_INTERVAL))
+  done
+  
+  if [ $ELAPSED -ge $MAX_WAIT ]; then
+    echo "⚠️  iOS build timed out after ${MAX_WAIT} seconds"
+    exit 1
+  fi
+  
+  echo "🎯 iOS build complete. Continuing with Android build..."
+fi
+
 # --- Ensure Node.js & npm ---
 if ! command -v npm &> /dev/null; then
   if [ "$OS_TYPE" = "ubuntu" ]; then
@@ -64,31 +159,14 @@ flutter pub run build_runner build --delete-conflicting-outputs
 
 # --- Platform-specific builds ---
 if [ "$OS_TYPE" = "ubuntu" ]; then
-  echo "Building APK for Android..."
+  echo "🤖 Building APK for Android..."
   flutter build apk --release
+  echo "✅ Android APK build complete!"
 elif [ "$OS_TYPE" = "macos" ]; then
-  echo "Building IPA for iOS..."
+  echo "🍎 Building IPA for iOS..."
   flutter build ipa --release --no-codesign
+  echo "✅ iOS IPA build complete!"
 fi
 
-# --- Trigger macOS builder on Ubuntu (Ubuntu can't build IPA) ---
-if [ "$OS_TYPE" = "ubuntu" ]; then
-  echo "Ubuntu detected. Triggering flutter-ios-builder workflow for iOS build..."
-  curl -X POST \
-    -H "Accept: application/vnd.github.v3+json" \
-    -H "Authorization: token ${GITHUB_PAT}" \
-    https://api.github.com/repos/karimzakzouk/flutter-ios-builder/dispatches \
-    -d "{
-      \"event_type\": \"trigger-macos-build\",
-      \"client_payload\": {
-        \"owner_name\": \"${OWNER_NAME}\",
-        \"repo_name\": \"${REPO_NAME}\",
-        \"branch\": \"${BRANCH}\",
-        \"commit_tag\": \"${COMMIT_TAG}\",
-        \"env_tag\": \"${ENV_TAG}\",
-        \"moving_tag\": \"${MOVING_TAG}\"
-      }
-    }"
-  echo "iOS build workflow triggered."
-fi
+echo "🎉 All builds completed successfully!"
 

cross-platform/deploy.sh

@@ -37,24 +37,40 @@ fi
 
 # Detect OS and upload appropriate build
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    # Ubuntu - Upload APK
+    # Ubuntu - Upload APK with commit tag
     APK_PATH="build/app/outputs/flutter-apk/app-release.apk"
+    APK_RENAMED="app-release-${COMMIT_TAG}.apk"
+    
     if [ -f "$APK_PATH" ]; then
-        gh release upload "${RELEASE_TAG}" "$APK_PATH" \
+        echo "📦 Renaming APK to: ${APK_RENAMED}"
+        cp "$APK_PATH" "$APK_RENAMED"
+        
+        gh release upload "${RELEASE_TAG}" "$APK_RENAMED" \
             --repo "${OWNER_NAME}/${REPO_NAME}" \
             --clobber
+        
+        echo "✅ Uploaded: ${APK_RENAMED}"
     else
+        echo "❌ APK not found at: ${APK_PATH}"
         exit 1
     fi
 
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-    # macOS - Upload IPA
+    # macOS - Upload IPA with commit tag
     IPA_PATH="build/ios/ipa/lam7a.ipa"
+    IPA_RENAMED="lam7a-${COMMIT_TAG}.ipa"
+    
     if [ -f "$IPA_PATH" ]; then
-        gh release upload "${RELEASE_TAG}" "$IPA_PATH" \
+        echo "📦 Renaming IPA to: ${IPA_RENAMED}"
+        cp "$IPA_PATH" "$IPA_RENAMED"
+        
+        gh release upload "${RELEASE_TAG}" "$IPA_RENAMED" \
             --repo "${OWNER_NAME}/${REPO_NAME}" \
             --clobber
+        
+        echo "✅ Uploaded: ${IPA_RENAMED}"
     else
+        echo "❌ IPA not found at: ${IPA_PATH}"
         exit 1
     fi
 fi