test

Author: Peterr181

.github/workflows/ci.yml

@@ -119,50 +119,55 @@ jobs:
           echo "Contents of client/dist:"
           ls -la client/dist
 
-      # Deploy to Heroku
-      - name: Deploy to Heroku
-        if: github.ref == 'refs/heads/main' && success()
-        env:
-          HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
-        run: |
-          # Enable error logging
-          set -x
-
-          # Ensure the public directory exists and copy files
-          mkdir -p server/public
-          cp -r client/dist/* server/public/
-
-          # Configure Git
-          git config --global user.email "[email protected]"
-          git config --global user.name "CI/CD Pipeline"
-
-          # Stage and commit the built files
-          git add server/public -f
-          git commit -m "Update frontend build [skip ci]" || echo "No changes to commit"
-
-          # Install Heroku CLI if not already installed
-          if ! command -v heroku &> /dev/null; then
+          - name: Deploy to Heroku
+          if: github.ref == 'refs/heads/main' && success()
+          env:
+            HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+          run: |
+            # Enable error logging
+            set -x
+            
+            # Create necessary directories
+            mkdir -p server/public
+            
+            # Copy built frontend files
+            cp -r client/dist/* server/public/
+            
+            # Create Procfile if it doesn't exist
+            echo "web: node server.js" > server/Procfile
+            
+            # Configure Git
+            git config --global user.email "[email protected]"
+            git config --global user.name "CI/CD Pipeline"
+            
+            # Install Heroku CLI
             curl https://cli-assets.heroku.com/install.sh | sh
-          fi
-
-          # Add Heroku remote
-          heroku git:remote -a gymero
-
-          # Push to Heroku
-          git push https://heroku:${{ secrets.HEROKU_API_KEY }}@git.heroku.com/gymero.git HEAD:main --force
-
-          # If deployment fails, show Heroku logs
-          if [ $? -ne 0 ]; then
-            heroku logs --tail --app gymero
-            exit 1
+            
+            # Add Heroku remote
+            heroku git:remote -a gymero
+            
+            # Stage all changes
+            git add -f server/public/* server/Procfile
+            git commit -m "Deploy: Include frontend build and Procfile" || echo "No changes to commit"
+            
+            # Push to Heroku
+            git push https://heroku:${{ secrets.HEROKU_API_KEY }}@git.heroku.com/gymero.git HEAD:main --force
+            
+            # Wait for deployment to complete
+            sleep 5
+            
+            # Check deployment status
+            if ! curl -s https://gymero.live > /dev/null; then
+              echo "Deployment verification failed"
+              heroku logs --tail --app gymero
+              exit 1
+            fi
 
-      # Post-deployment verification
-      - name: Verify deployment
-        if: github.ref == 'refs/heads/main' && success()
-        run: |
-          echo "Waiting for deployment to stabilize..."
-          sleep 30
-          curl --fail https://gymero.live || exit 1
+          - name: Verify deployment
+          if: success()
+          run: |
+            echo "Deployment completed successfully"
+            curl -I https://gymero.live
 
       # Debug MySQL logs if needed
       - name: MySQL Logs

server/package.json

@@ -7,9 +7,7 @@
   "scripts": {
     "start": "node server.js",
     "dev": "nodemon server.js",
-    "test": "echo \"No tests specified\"",
-    "build": "cd ../client && npm install && npm run build && cp -r dist/* ../server/public/",
-    "heroku-postbuild": "cd ../client && npm install && npm run build && cp -r dist/* ../server/public/"
+    "test": "echo \"No tests specified\""
   },
   "keywords": [],
   "author": "",