Update deployment workflow (main + master support + cleanup)

.github/workflows/push-dappbundle.yml

@@ -1,11 +1,18 @@
-name: Workflow push to Dappbundle
+name: Deploy to Dappbundle
-on: [push]
+
+on:
+  push:
+    branches:
+      - main
+      - master
+
 jobs:
   build:
-    name: Build
+    name: Deploy
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
+
     steps:
-      - name: Executing remote command
+      - name: Deploy via SSH
         uses: appleboy/ssh-action@v1.0.0
         with:
           host: ${{ secrets.R_HOST }}
@@ -13,20 +20,35 @@ jobs:
           password: ${{ secrets.P_PASSWORD }}
           port: ${{ secrets.SSH_PORT }}
           script: |
-            if [ -d "${{ secrets.DEPLOYMENT_LOCATION}}/dappbundle" ]; then
+            set -e
-              echo "Folder exists. Skipping Git clone."
+
+            BASE="${{ secrets.DEPLOYMENT_LOCATION }}"
+            APP="${{ github.event.repository.name }}"
+
+            echo "== Ensuring dappbundle repo exists =="
+
+            if [ ! -d "$BASE/dappbundle/.git" ]; then
+              git clone git@gitea.ranchimall.net:RanchiMall/dappbundle.git "$BASE/dappbundle"
             else
-              echo "Folder does not exist. Cloning repository..."
+              cd "$BASE/dappbundle"
-              cd ${{ secrets.DEPLOYMENT_LOCATION}}/ && git clone https://github.com/ranchimall/dappbundle.git 
+              git pull
             fi
 
-            if [ -d "${{ secrets.DEPLOYMENT_LOCATION}}/dappbundle/${{ github.event.repository.name }}" ]; then
+            echo "== Refreshing app bundle =="
-              echo "Repository exists. Remove folder "
-              rm -r "${{ secrets.DEPLOYMENT_LOCATION}}/dappbundle/${{ github.event.repository.name }}"
-            fi
 
-            echo "Cloning repository..."
+            rm -rf "$BASE/dappbundle/$APP"
-            cd ${{ secrets.DEPLOYMENT_LOCATION}}/dappbundle && git clone https://github.com/ranchimall/${{ github.event.repository.name }}
+            git clone git@gitea.ranchimall.net:RanchiMall/$APP.git "$BASE/dappbundle/$APP"
 
-            cd "${{ secrets.DEPLOYMENT_LOCATION}}/dappbundle/${{ github.event.repository.name }}" && rm -rf .gitattributes .git .github .gitignore
+            echo "== Cleaning git metadata =="
-            cd ${{ secrets.DEPLOYMENT_LOCATION}}/dappbundle/ && git add . && git commit -m "Workflow updating files of ${{ github.event.repository.name }}" && git push "https://saketongit:${{ secrets.RM_ACCESS_TOKEN }}@github.com/ranchimall/dappbundle.git"
+
+            cd "$BASE/dappbundle/$APP"
+            rm -rf .git .github .gitignore .gitattributes
+
+            cd "$BASE/dappbundle"
+
+            git config user.email "ranchimallfze@gmail.com"
+            git config user.name "ranchimall"
+
+            git add .
+            git commit -m "Auto-update $APP" || echo "No changes"
+            git push