diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md index 0dd1dc0..e426e12 100644 --- a/DEPLOYMENT.md +++ b/DEPLOYMENT.md @@ -5,43 +5,46 @@ ``` main (production) │ - └── develop (staging) + └── develop (staging/testing) │ └── feature branches ``` -## Environments +## 🌡️ Testing Workflow (MANDATORY) -| Branch | URL | Purpose | -|--------|-----|---------| -| **main** | sitmente.com | Live production | -| **develop** | sitmente-git-develop...vercel.app | Testing/staging | -| **PR previews** | vercel.app/pr-*** | Feature testing | +**Rule: NEVER push directly to main without testing first.** -## Workflow - -### 1. Development (on VPS) -```bash -# Work on develop branch -git checkout develop -# ... make changes ... -git add -A && git commit -m "Description" -git push origin develop +``` +1. WORK on develop branch +2. TEST on staging (Vercel preview) +3. GET approval from Haitham +4. MERGE to main ``` -### 2. Test on Staging -- Vercel auto-deploys `develop` branch -- URL: Check Vercel dashboard -- Test all changes - -### 3. Production +### Steps: ```bash -# Merge to main +# 1. Work on develop +git checkout develop +# ... make changes ... + +# 2. Push to test +git add -A && git commit -m "Description" +git push origin develop + +# 3. Wait for Haitham's approval + +# 4. After approval, merge to main git checkout main git merge develop git push origin main ``` +### Deployment URLs: +| Branch | URL | Purpose | +|--------|-----|---------| +| **main** | sitmente.com | Live production | +| **develop** | vercel preview | Testing/staging | + ## Vercel Auto-Deploy | Event | Action | @@ -49,9 +52,3 @@ git push origin main | Push to `main` | Auto-deploy to sitmente.com | | Push to `develop` | Auto-deploy to preview URL | | Open PR | Create preview deployment | - -## Current Status - -- ✅ **main** → sitmente.com (production) -- ✅ **develop** → staging (testing) -- ✅ **Preview deployments** → Auto for all branches