Merge pull request #600 from hngprojects/Rob-in-son-no-docker

cd: updated working-dir

.github/workflows/dev.yml

@@ -1,61 +1,78 @@
 name: Deploy to Dev
 
 on:
-  workflow_run:
-    workflows: [CI]
-    types:
-      - completed
-    branches: [dev]
+  push:
+    branches:
+      - dev
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: bingo
+    defaults:
+      run:
+        working-directory: /var/www/aihomework/boilerplates/dev
+
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      # - name: Install sshpass
-      #   run: sudo apt-get install sshpass
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
-      - name: Fetch .env file from server
-        run: |
-          sshpass -p ${{ secrets.PASSWORD }} scp -o StrictHostKeyChecking=no ${{ secrets.USERNAME }}@${{ secrets.HOST }}:/var/www/aihomework/dev/.env .env
-        env:
-          SSH_HOST: ${{ secrets.HOST }}
-          SSH_USERNAME: ${{ secrets.USERNAME }}
-          SSH_PASSWORD: ${{ secrets.PASSWORD }}
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20' 
 
-      - name: Build Docker images
+      # - name: Remove old actions remote URL
+      #   continue-on-error: true
+      #   run: |
+      #       git remote rm action
+
+      # - name: Stash or remove local changes
+      #   run: |
+      #       if git diff --quiet; then
+      #         echo "No local changes to stash."
+      #       else
+      #         echo "Stashing local changes..."
+      #         git stash --include-untracked || echo "Failed to stash changes. Attempting to reset..."
+      #         git reset --hard || exit 1
+      #       fi
+
+      - name: Pull from GitHub
+        id: pull
         run: |
-          docker compose --env-file .env -f docker-compose.yml build
+            remote_repo="https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git"
+            git remote add action $remote_repo
+            git pull action dev
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
 
-      - name: List Docker images
-        run: docker images
+      - name: Run tests
+        run: yarn test
 
-      - name: Save Docker images to tarball
+      - name: Build the application
+        run: yarn build && sudo rm -rf build
+
+      # - name: Generate migrations
+      #   run: yarn migration:generate
+
+      # - name: Run migrations
+      #   run: yarn migration:run
+
+      - name: Setup and restart service
         run: |
-          docker save hng_boilerplate_expressjs-backend:latest | gzip > dev-images.tar.gz
+          sudo cp server-script/aihomeworkdev.service /etc/systemd/system
+          sudo systemctl daemon-reload
+          sudo systemctl restart aihomeworkdev.service
 
-      - name: Copy Docker images to server
-        uses: appleboy/scp-action@master
-        with:
-          host: ${{ secrets.HOST }}
-          username: ${{ secrets.USERNAME }}
-          password: ${{ secrets.PASSWORD }}
-          source: "dev-images.tar.gz"
-          target: "~/images-tar"
-
-      - name: Deploy to server
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.HOST }}
-          username: ${{ secrets.USERNAME }}
-          password: ${{ secrets.PASSWORD }}
-          script: |
-            cd ~/dev-deployment/hng_boilerplate_expressjs
-            git stash
-            git checkout dev
-            git pull
-            docker load -i ~/images-tar/dev-images.tar.gz
-            docker compose -f docker-compose.yml down
-            docker compose -f docker-compose.yml up -d
+      - name: Verify deployment
+        run: |
+          echo "Waiting for service to start..."
+          sleep 10
+          if sudo systemctl is-active --quiet aihomeworkdev.service; then
+            echo "Deployment successful!"
+          else
+            echo "Deployment failed!"
+            exit 1
+          fi

server-script/startappdev.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-cd /var/www/aihomework/dev/
+cd /var/www/aihomework/boilerplates/dev/
 mkdir -p logs
 /usr/bin/yarn start >> logs/devoutput.log 2>&1