Add mandatory testing workflow rule
This commit is contained in:
+26
-29
@@ -5,43 +5,46 @@
|
|||||||
```
|
```
|
||||||
main (production)
|
main (production)
|
||||||
│
|
│
|
||||||
└── develop (staging)
|
└── develop (staging/testing)
|
||||||
│
|
│
|
||||||
└── feature branches
|
└── feature branches
|
||||||
```
|
```
|
||||||
|
|
||||||
## Environments
|
## 🌡️ Testing Workflow (MANDATORY)
|
||||||
|
|
||||||
| Branch | URL | Purpose |
|
**Rule: NEVER push directly to main without testing first.**
|
||||||
|--------|-----|---------|
|
|
||||||
| **main** | sitmente.com | Live production |
|
|
||||||
| **develop** | sitmente-git-develop...vercel.app | Testing/staging |
|
|
||||||
| **PR previews** | vercel.app/pr-*** | Feature testing |
|
|
||||||
|
|
||||||
## Workflow
|
```
|
||||||
|
1. WORK on develop branch
|
||||||
### 1. Development (on VPS)
|
2. TEST on staging (Vercel preview)
|
||||||
```bash
|
3. GET approval from Haitham
|
||||||
# Work on develop branch
|
4. MERGE to main
|
||||||
git checkout develop
|
|
||||||
# ... make changes ...
|
|
||||||
git add -A && git commit -m "Description"
|
|
||||||
git push origin develop
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### 2. Test on Staging
|
### Steps:
|
||||||
- Vercel auto-deploys `develop` branch
|
|
||||||
- URL: Check Vercel dashboard
|
|
||||||
- Test all changes
|
|
||||||
|
|
||||||
### 3. Production
|
|
||||||
```bash
|
```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 checkout main
|
||||||
git merge develop
|
git merge develop
|
||||||
git push origin main
|
git push origin main
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Deployment URLs:
|
||||||
|
| Branch | URL | Purpose |
|
||||||
|
|--------|-----|---------|
|
||||||
|
| **main** | sitmente.com | Live production |
|
||||||
|
| **develop** | vercel preview | Testing/staging |
|
||||||
|
|
||||||
## Vercel Auto-Deploy
|
## Vercel Auto-Deploy
|
||||||
|
|
||||||
| Event | Action |
|
| Event | Action |
|
||||||
@@ -49,9 +52,3 @@ git push origin main
|
|||||||
| Push to `main` | Auto-deploy to sitmente.com |
|
| Push to `main` | Auto-deploy to sitmente.com |
|
||||||
| Push to `develop` | Auto-deploy to preview URL |
|
| Push to `develop` | Auto-deploy to preview URL |
|
||||||
| Open PR | Create preview deployment |
|
| Open PR | Create preview deployment |
|
||||||
|
|
||||||
## Current Status
|
|
||||||
|
|
||||||
- ✅ **main** → sitmente.com (production)
|
|
||||||
- ✅ **develop** → staging (testing)
|
|
||||||
- ✅ **Preview deployments** → Auto for all branches
|
|
||||||
|
|||||||
Reference in New Issue
Block a user