Skip to content

Commit b293da4

Browse files
gburdgithub-actions[bot]
gburd
authored and
github-actions[bot]
committed
Rebase on upstream hourly, add AI/LLM PR review
 - Hourly upstream sync from postgres/postgres (24x daily) - AI-powered PR reviews using AWS Bedrock Claude Sonnet 4.5 - Multi-platform CI via existing Cirrus CI configuration - Cost tracking and comprehensive documentation Features: - Automatic issue creation on sync conflicts - PostgreSQL-specific code review prompts (C, SQL, docs, build) - Cost limits: $15/PR, $200/month - Inline PR comments with security/performance labels - Skip draft PRs to save costs Documentation: - .github/SETUP_SUMMARY.md - Quick setup overview - .github/QUICKSTART.md - 15-minute setup guide - .github/PRE_COMMIT_CHECKLIST.md - Verification checklist - .github/docs/ - Detailed guides for sync, AI review, Bedrock See .github/README.md for complete overview Complete Phase 3: Windows builds + fix sync for CI/CD commits Phase 3: Windows Dependency Build System - Implement full build workflow (OpenSSL, zlib, libxml2) - Smart caching by version hash (80% cost reduction) - Dependency bundling with manifest generation - Weekly auto-refresh + manual triggers - PowerShell download helper script - Comprehensive usage documentation Sync Workflow Fix: - Allow .github/ commits (CI/CD config) on master - Detect and reject code commits outside .github/ - Merge upstream while preserving .github/ changes - Create issues only for actual pristine violations Documentation: - Complete Windows build usage guide - Update all status docs to 100% complete - Phase 3 completion summary All three CI/CD phases complete (100%): ✅ Hourly upstream sync with .github/ preservation ✅ AI-powered PR reviews via Bedrock Claude 4.5 ✅ Windows dependency builds with smart caching Cost: $40-60/month total See .github/PHASE3_COMPLETE.md for details Fix sync to allow 'dev setup' commits on master The sync workflow was failing because the 'dev setup v19' commit modifies files outside .github/. Updated workflows to recognize commits with messages starting with 'dev setup' as allowed on master. Changes: - Detect 'dev setup' commits by message pattern (case-insensitive) - Allow merge if commits are .github/ OR dev setup OR both - Update merge messages to reflect preserved changes - Document pristine master policy with examples This allows personal development environment commits (IDE configs, debugging tools, shell aliases, Nix configs, etc.) on master without violating the pristine mirror policy. Future dev environment updates should start with 'dev setup' in the commit message to be automatically recognized and preserved. See .github/docs/pristine-master-policy.md for complete policy See .github/DEV_SETUP_FIX.md for fix summary Optimize CI/CD costs by skipping builds for pristine commits Add cost optimization to Windows dependency builds to avoid expensive builds when only pristine commits are pushed (dev setup commits or .github/ configuration changes). Changes: - Add check-changes job to detect pristine-only pushes - Skip Windows builds when all commits are dev setup or .github/ only - Add comprehensive cost optimization documentation - Update README with cost savings (~40% reduction) Expected savings: ~$3-5/month on Windows builds, ~$40-47/month total through combined optimizations. Manual dispatch and scheduled builds always run regardless.
1 parent 02976b0 commit b293da4

29 files changed

Lines changed: 9625 additions & 0 deletions

‎.github/.gitignore‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Node modules
2+
scripts/ai-review/node_modules/
3+
# Note: package-lock.json should be committed for reproducible CI/CD builds
4+
5+
# Logs
6+
scripts/ai-review/cost-log-*.json
7+
scripts/ai-review/*.log
8+
9+
# OS files
10+
.DS_Store
11+
Thumbs.db
12+
13+
# Editor files
14+
*.swp
15+
*.swo
16+
*~
17+
.vscode/
18+
.idea/

‎.github/DEV_SETUP_FIX.md‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
# Dev Setup Commit Fix - Summary
2+
3+
**Date:** 2026-03-10
4+
**Issue:** Sync workflow was failing because "dev setup" commits were detected as pristine master violations
5+
6+
## Problem
7+
8+
The sync workflow was rejecting the "dev setup v19" commit (e5aa2da496c) because it modifies files outside `.github/`. The original logic only allowed `.github/`-only commits, but didn't account for personal development environment commits.
9+
10+
## Solution
11+
12+
Updated sync workflows to recognize commits with messages starting with "dev setup" (case-insensitive) as allowed on master, in addition to `.github/`-only commits.
13+
14+
## Changes Made
15+
16+
### 1. Updated Sync Workflows
17+
18+
**Files modified:**
19+
- `.github/workflows/sync-upstream.yml` (automatic hourly sync)
20+
- `.github/workflows/sync-upstream-manual.yml` (manual sync)
21+
22+
**New logic:**
23+
```bash
24+
# Check for "dev setup" commits
25+
DEV_SETUP_COMMITS=$(git log --format=%s upstream/master..origin/master | grep -i "^dev setup" | wc -l)
26+
27+
# Allow merge if:
28+
# - Only .github/ changes, OR
29+
# - Has "dev setup" commits
30+
if [ "$COMMITS_AHEAD" -gt 0 ] && [ "$NON_GITHUB_CHANGES" -gt 0 ]; then
31+
if [ "$DEV_SETUP_COMMITS" -eq 0 ]; then
32+
# FAIL: Code changes outside .github/ that aren't dev setup
33+
exit 1
34+
else
35+
# OK: Dev setup commits are allowed
36+
continue merge
37+
fi
38+
fi
39+
```
40+
41+
### 2. Created Policy Documentation
42+
43+
**New file:** `.github/docs/pristine-master-policy.md`
44+
45+
Documents the "mostly pristine" master policy:
46+
- ✅ `.github/` commits allowed (CI/CD configuration)
47+
- ✅ "dev setup ..." commits allowed (personal development environment)
48+
- ❌ Code changes not allowed (must use feature branches)
49+
50+
## Current Commit Order
51+
52+
```
53+
master:
54+
1. 9a2b895daa0 - Complete Phase 3: Windows builds + fix sync (newest)
55+
2. 1e6379300f8 - Add CI/CD automation: hourly sync, Bedrock AI review
56+
3. e5aa2da496c - dev setup v19
57+
4. 03facc1211b - upstream commits... (oldest)
58+
```
59+
60+
**All three local commits will now be preserved during sync:**
61+
- Commit 1: Modifies `.github/` ✅
62+
- Commit 2: Modifies `.github/` ✅
63+
- Commit 3: Named "dev setup v19" ✅
64+
65+
## Testing
66+
67+
After committing these changes, the next hourly sync should:
68+
1. Detect 3 commits ahead of upstream (including the fix commit)
69+
2. Recognize that they're all allowed (`.github/` or "dev setup")
70+
3. Successfully merge upstream changes
71+
4. Create merge commit preserving all local commits
72+
73+
**Verify manually:**
74+
```bash
75+
# Trigger manual sync
76+
# Actions → "Sync from Upstream (Manual)" → Run workflow
77+
78+
# Check logs for:
79+
# "✓ Found 1 'dev setup' commit(s) - will merge"
80+
# "✓ Successfully merged upstream with local configuration"
81+
```
82+
83+
## Future Updates
84+
85+
When updating your development environment:
86+
87+
```bash
88+
# Make changes
89+
git add .clangd flake.nix .vscode/ .idea/
90+
91+
# IMPORTANT: Start commit message with "dev setup"
92+
git commit -m "dev setup v20: Update IDE and LSP configuration"
93+
94+
git push origin master
95+
```
96+
97+
The sync will recognize this and preserve it during merges.
98+
99+
**Naming patterns recognized:**
100+
- `dev setup v20` ✅
101+
- `Dev setup: Update tools` ✅
102+
- `DEV SETUP - New config` ✅
103+
- `development environment changes` ❌ (doesn't start with "dev setup")
104+
105+
## Benefits
106+
107+
1. **No manual sync resolution needed** for dev environment updates
108+
2. **Simpler workflow** - dev setup stays on master where it's convenient
109+
3. **Clear policy** - documented what's allowed vs what requires feature branches
110+
4. **Automatic detection** - sync workflow handles it all automatically
111+
112+
## What to Commit
113+
114+
```bash
115+
git add .github/workflows/sync-upstream.yml
116+
git add .github/workflows/sync-upstream-manual.yml
117+
git add .github/docs/pristine-master-policy.md
118+
git add .github/DEV_SETUP_FIX.md
119+
120+
git commit -m "Fix sync to allow 'dev setup' commits on master
121+
122+
The sync workflow was failing because the 'dev setup v19' commit
123+
modifies files outside .github/. Updated workflows to recognize
124+
commits with messages starting with 'dev setup' as allowed on master.
125+
126+
Changes:
127+
- Detect 'dev setup' commits by message pattern
128+
- Allow merge if commits are .github/ OR dev setup
129+
- Update merge messages to reflect preserved changes
130+
- Document pristine master policy
131+
132+
This allows personal development environment commits (IDE configs,
133+
debugging tools, shell aliases, etc.) on master without violating
134+
the pristine mirror policy.
135+
136+
See .github/docs/pristine-master-policy.md for details"
137+
138+
git push origin master
139+
```
140+
141+
## Next Sync Expected Behavior
142+
143+
```
144+
Before:
145+
Upstream: A---B---C---D (latest upstream)
146+
Master: A---B---C---X---Y---Z (X=CI/CD, Y=CI/CD, Z=dev setup)
147+
148+
Status: 3 commits ahead, 1 commit behind
149+
150+
After:
151+
Master: A---B---C---X---Y---Z---M
152+
\ /
153+
D-------/
154+
155+
Where M = Merge commit preserving all local changes
156+
```
157+
158+
All three local commits (CI/CD + dev setup) preserved! ✅
159+
160+
---
161+
162+
**Status:** Ready to commit and test
163+
**Documentation:** See `.github/docs/pristine-master-policy.md`

0 commit comments

Comments
 (0)