Skip to content
Merged

Dev #11

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/pr-into-dev.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# ─────────────────────────────────────────────────────────────────
# PR into Dev Workflow
# ─────────────────────────────────────────────────────────────────
# Validates feature/fix/hotfix pull requests before merging to dev.
# Validates pull requests before merging to dev.
#
# Validations:
# - Source branch must be feature/*, fix/*, or hotfix/*
# - Source branch must be feature/*, fix/*, hotfix/*, or test/*
# - PR title must follow conventional commit format
# - At least one issue must be linked
# - All quality gates must pass
# - Fork PRs run read-only checks
#
# Author: Alireza Rezvani
# Date: 2025-11-06
# Date: 2025-11-07
# ─────────────────────────────────────────────────────────────────

name: PR into Dev
Expand Down Expand Up @@ -77,13 +77,14 @@ jobs:
echo "πŸ” Validating branch name: $BRANCH_NAME"

# Check if branch follows naming convention
if [[ ! "$BRANCH_NAME" =~ ^(feature|fix|hotfix)/ ]]; then
if [[ ! "$BRANCH_NAME" =~ ^(feature|fix|hotfix|test)/ ]]; then
echo "❌ Invalid branch name: $BRANCH_NAME"
echo ""
echo "Branch must start with one of:"
echo " - feature/ (for new features)"
echo " - fix/ (for bug fixes)"
echo " - hotfix/ (for critical fixes)"
echo " - test/ (for workflow testing)"
echo ""
echo "Example: feature/issue-123-add-user-auth"
exit 1
Expand Down
67 changes: 67 additions & 0 deletions PROPER_TEST_FLOW.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# Proper Workflow Test - Standard Flow

**Date**: 2025-11-07
**Flow**: `test/proper-workflow-validation β†’ dev β†’ main`
**Purpose**: Validate correct branch flow and release gates

---

## βœ… Correct Flow

### Step 1: test/* β†’ dev
- Branch: `test/proper-workflow-validation`
- Target: `dev`
- Expected: PR should be allowed and checks should run

### Step 2: dev β†’ main
- Branch: `dev`
- Target: `main`
- Expected: Release gates should run and pass

---

## What This Tests

### Branch Pattern Enforcement
- βœ… test/* branches CANNOT merge directly to main
- βœ… test/* branches CAN merge to dev
- βœ… dev branch CAN merge to main
- βœ… Proper error messages when flow is violated

### Standard Flow Validation
- βœ… PR checks run on test/* β†’ dev
- βœ… Release gates run on dev β†’ main
- βœ… All quality gates execute properly
- βœ… No workflow bypasses

### Complete Release Pipeline
1. Feature/test development on test/* branch
2. PR and merge to dev
3. Dev accumulates changes
4. Release PR from dev to main
5. Release gates validate production readiness
6. Merge to main (production)

---

## Success Criteria

**PR #1 (test/* β†’ dev):**
- βœ… PR allowed and created
- βœ… Quality checks run
- βœ… Can be merged to dev

**PR #2 (dev β†’ main):**
- βœ… Source branch validation passes (dev is allowed)
- βœ… Production build succeeds
- βœ… Smoke tests pass
- βœ… Security scan runs (informational)
- βœ… Deployment readiness completes
- βœ… Release gate status evaluates correctly
- βœ… Can be merged to main

---

**Created**: 2025-11-07
**Previous PR #8**: Closed (test/* β†’ main not allowed)
**This PR Flow**: test/* β†’ dev β†’ main (correct)
Loading