fix-77

.gitlab-ci.yml

@@ -2,33 +2,24 @@ stages:
   - deploy
 
 before_script:
-  # # Load NVM and Node.js
-  # - export NVM_DIR="$HOME/.nvm"
-  # - '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"'
-  # - nvm use 20
-  # # Commands to be run before any job
-  # - rm -rf node_modules
-  # - rm -f package-lock.json
-  # - npm install
   # Load NVM and Node.js
-
   - export NVM_DIR="$HOME/.nvm"
   - '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"'
   - nvm use 20
-  # Clean installation
-  - rm -rf node_modules
-  - rm -f package-lock.json
+
+  # Clean and install dependencies
+  - rm -rf node_modules package-lock.json
   - npm cache clean --force
   - npm install
   # Verify React installation
   - ls -la node_modules/react/
+  - ls -la index.js # debug: make sure index.js exists
 
 deploy_job:
   stage: deploy
   tags:
     - 2nd
   variables:
-    SECURE_FILES_DOWNLOAD_PATH: './android/'
     VERSION_NAME: '4.4.2'
     APK_NAME_PREFIX: 'testApp_01'
     APK_NAME: $APK_NAME_PREFIX'_'$VERSION_NAME'_'$(date '+%d%B')
@@ -39,32 +30,36 @@ deploy_job:
 
   script:
     # -----------------------
-    # Setup SSH
+    # SSH setup
     # -----------------------
     - mkdir -p ~/.ssh
     - echo "$SSH_KEY" > ~/.ssh/id_rsa
     - chmod 600 ~/.ssh/id_rsa
-
-    # Start SSH Agent and add password-protected key
     - eval "$(ssh-agent -s)"
     - ssh-add ~/.ssh/id_rsa <<< "$SSH_PASSPHRASE"
+    - ssh-keyscan -H -p $SSH_PORT $SERVER_IP >> ~/.ssh/known_hosts
 
-    # Add host to known_hosts
-    - ssh-keyscan -p $SSH_PORT $SERVER_IP >> ~/.ssh/known_hosts
-
+    # -----------------------
+    # Optional: download secure files if needed
+    # -----------------------
     - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
 
     # -----------------------
     # Build APK
     # -----------------------
     - export JAVA_HOME=$(/usr/libexec/java_home -v 17)
-    - npx react-native bundle --platform android --dev false --entry-file index.js \
-      --bundle-output android/app/src/main/assets/index.android.bundle \
-      --assets-dest android/app/src/main/res/
+    - echo "sdk.dir=/Users/tltestuser/Library/Android/sdk" > android/local.properties
+
+    # Bundle JS (make sure in project root)
+    - cd $CI_PROJECT_DIR
+    - npx react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/
+
+    # Go to Android folder and clean old resources
     - cd android
     - rm -rf ./app/src/main/res/**/node_modules_* ./app/src/main/res/**/app_assets* ./app/src/main/res/**/assets* ./app/src/main/res/**/app*
     - rm -rf ./.gradle/6.8.3/executionHistory/executionHistory.lock
-    - echo "sdk.dir=/Users/tltestuser/Library/Android/sdk" > local.properties
+
+    # Build release APK
     - ./gradlew assembleRelease
 
     # -----------------------
@@ -73,13 +68,12 @@ deploy_job:
     - find ./app/build/outputs/apk -type f -name "*.apk"
     - APK_DIR="./app/build/outputs/apk/release"
     - cd $APK_DIR
-    - mv app-release.apk "$APK_NAME_PREFIX"_"$VERSION_NAME"_$(date '+%d%B').apk
+    - mv app-release.apk "$APK_NAME"
 
     # -----------------------
-    # Secure Upload (SCP)
+    # Upload APK
     # -----------------------
     - scp -P $SSH_PORT *.apk $SSH_USER@$SERVER_IP:/var/www/n.trucklagbe.com/html/APK/QO/
-    #     - scp -i /Users/tltestuser/Downloads/ndot_key_14012025 -P 3716 *.apk custodian@n.trucklagbe.com:/var/www/n.trucklagbe.com/html/APK/QO/
 
   except:
     - pushes