Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
9218f34
Rebase on upstream hourly, add AI/LLM PR review
gburd Mar 10, 2026
60641f2
[DO NOT MERGE] dev: Nix flake for reproducible Lime-pinned dev shell
gburd Jun 5, 2026
d4d9327
build: add Lime parser-generator probe + tooling (Phase 1)
gburd Jun 5, 2026
0db81d2
replication: port grammars + scanners to Lime (Phase 2a/2b/5)
gburd Jun 5, 2026
91190b1
bootstrap: port BKI parser to Lime (Phase 2c)
gburd Jun 5, 2026
79f3099
isolation: port spec parser to Lime (Phase 2f/5)
gburd Jun 5, 2026
6be57a4
jsonpath: port grammar + scanner to Lime (Phase 2e/5)
gburd Jun 5, 2026
4f15212
fe_utils, psql, pgbench: port frontend lexers to Lime (Phase 2d/2h/5)
gburd Jun 5, 2026
9b7cf5c
guc: port configuration-file scanner to Lime (Phase 2g/5)
gburd Jun 5, 2026
0a4434b
parser: port backend SQL grammar + scanner + ecpg to Lime (Phase 2k/5)
gburd Jun 5, 2026
ced6f55
plpgsql: port pl_gram to Lime (Phase 2j)
gburd Jun 5, 2026
70ac4ed
contrib: port cube, seg, pg_plan_advice to Lime (Phase 5)
gburd Jun 5, 2026
138f126
doc: list Lime as a build dependency in installation.sgml
gburd Jun 5, 2026
1713643
[DO NOT MERGE] parser: runtime grammar-extension API (Phase 4)
gburd Jun 5, 2026
2d15724
[DO NOT MERGE] test/modules: grammar-extension test + benchmark modules
gburd Jun 5, 2026
0dc5235
[DO NOT MERGE] contrib: revive Berkeley QUEL via runtime grammar exte…
gburd Jun 5, 2026
368b788
parser: emit + isolate Lime grammar snapshot for runtime extension (T…
gburd Jun 16, 2026
ae0fba6
parser: Track B in-process push-parse path via Lime host-reduce (v1.6.1)
gburd Jun 17, 2026
c3054f4
parser: link in-process Lime compiler strong into backend (Track B)
gburd Jun 17, 2026
1d405eb
parser: compose grammar extensions in-process, delete cc pipeline (Tr…
gburd Jun 17, 2026
30247b9
parser: pre-warm grammar-extension compose at postmaster start (Track…
gburd Jun 17, 2026
0a3eff5
parser: resolve extension keyword lexemes to composed token codes (Tr…
gburd Jun 17, 2026
947888b
parser: oracle-resolve colliding extension keywords (Track B P4 tier 1)
gburd Jun 18, 2026
4d8dcd9
parser: document load-at-start grammar-extension lifecycle (Track B P…
gburd Jun 18, 2026
1262aa5
parser: drive the Lime push parser by default when extensions are act…
gburd Jun 18, 2026
5c54e2c
parser: fork-resolve the DELETE keyword collision via one-token peek …
gburd Jun 18, 2026
893c0a0
WIP: bump Lime to v1.8.2 (session fold pending)
gburd Jul 5, 2026
2664e2b
WIP: Track B conflict gate + push-parse fixes (session fold pending)
gburd Jul 5, 2026
9a7689c
WIP: QUEL value-ABI + unit-rule workaround + test (session fold pending)
gburd Jul 5, 2026
8fddc68
WIP: UPSERT grammar-extension demonstrator (session fold pending)
gburd Jul 5, 2026
7e73b11
WIP: grammar-ext test infra (conflict-gate india, overlap, typedefs)
gburd Jul 5, 2026
5157534
WIP: pin Lime v1.8.2 (v1.8.3 exposes ruleno-mapping bug; fold pending)
gburd Jul 23, 2026
4b6ec6d
WIP: expand QUEL (result attrs, UNIQUE, INTO, scalar aggregates, robu…
gburd Aug 4, 2026
d6bd63b
WIP: fix pgpa driver rebase resolution (NO_SCAN tags not in current m…
gburd Aug 4, 2026
0819570
WIP: pgpa port -- thread lex-error message+location (integer_junk, ou…
gburd Aug 4, 2026
e377370
WIP: converter -- suppress false-positive untyped-nonterminal WARN in…
gburd Aug 4, 2026
747f04f
WIP: silence meson multi-output custom_target warnings (use .to_list(…
gburd Aug 4, 2026
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
163 changes: 163 additions & 0 deletions .github/DEV_SETUP_FIX.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
# Dev Setup Commit Fix - Summary

**Date:** 2026-03-10
**Issue:** Sync workflow was failing because "dev setup" commits were detected as pristine master violations

## Problem

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.

## Solution

Updated sync workflows to recognize commits with messages starting with "dev setup" (case-insensitive) as allowed on master, in addition to `.github/`-only commits.

## Changes Made

### 1. Updated Sync Workflows

**Files modified:**
- `.github/workflows/sync-upstream.yml` (automatic hourly sync)
- `.github/workflows/sync-upstream-manual.yml` (manual sync)

**New logic:**
```bash
# Check for "dev setup" commits
DEV_SETUP_COMMITS=$(git log --format=%s upstream/master..origin/master | grep -i "^dev setup" | wc -l)

# Allow merge if:
# - Only .github/ changes, OR
# - Has "dev setup" commits
if [ "$COMMITS_AHEAD" -gt 0 ] && [ "$NON_GITHUB_CHANGES" -gt 0 ]; then
if [ "$DEV_SETUP_COMMITS" -eq 0 ]; then
# FAIL: Code changes outside .github/ that aren't dev setup
exit 1
else
# OK: Dev setup commits are allowed
continue merge
fi
fi
```

### 2. Created Policy Documentation

**New file:** `.github/docs/pristine-master-policy.md`

Documents the "mostly pristine" master policy:
- ✅ `.github/` commits allowed (CI/CD configuration)
- ✅ "dev setup ..." commits allowed (personal development environment)
- ❌ Code changes not allowed (must use feature branches)

## Current Commit Order

```
master:
1. 9a2b895daa0 - Complete Phase 3: Windows builds + fix sync (newest)
2. 1e6379300f8 - Add CI/CD automation: hourly sync, Bedrock AI review
3. e5aa2da496c - dev setup v19
4. 03facc1211b - upstream commits... (oldest)
```

**All three local commits will now be preserved during sync:**
- Commit 1: Modifies `.github/` ✅
- Commit 2: Modifies `.github/` ✅
- Commit 3: Named "dev setup v19" ✅

## Testing

After committing these changes, the next hourly sync should:
1. Detect 3 commits ahead of upstream (including the fix commit)
2. Recognize that they're all allowed (`.github/` or "dev setup")
3. Successfully merge upstream changes
4. Create merge commit preserving all local commits

**Verify manually:**
```bash
# Trigger manual sync
# Actions → "Sync from Upstream (Manual)" → Run workflow

# Check logs for:
# "✓ Found 1 'dev setup' commit(s) - will merge"
# "✓ Successfully merged upstream with local configuration"
```

## Future Updates

When updating your development environment:

```bash
# Make changes
git add .clangd flake.nix .vscode/ .idea/

# IMPORTANT: Start commit message with "dev setup"
git commit -m "dev setup v20: Update IDE and LSP configuration"

git push origin master
```

The sync will recognize this and preserve it during merges.

**Naming patterns recognized:**
- `dev setup v20` ✅
- `Dev setup: Update tools` ✅
- `DEV SETUP - New config` ✅
- `development environment changes` ❌ (doesn't start with "dev setup")

## Benefits

1. **No manual sync resolution needed** for dev environment updates
2. **Simpler workflow** - dev setup stays on master where it's convenient
3. **Clear policy** - documented what's allowed vs what requires feature branches
4. **Automatic detection** - sync workflow handles it all automatically

## What to Commit

```bash
git add .github/workflows/sync-upstream.yml
git add .github/workflows/sync-upstream-manual.yml
git add .github/docs/pristine-master-policy.md
git add .github/DEV_SETUP_FIX.md

git commit -m "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
- Allow merge if commits are .github/ OR dev setup
- Update merge messages to reflect preserved changes
- Document pristine master policy

This allows personal development environment commits (IDE configs,
debugging tools, shell aliases, etc.) on master without violating
the pristine mirror policy.

See .github/docs/pristine-master-policy.md for details"

git push origin master
```

## Next Sync Expected Behavior

```
Before:
Upstream: A---B---C---D (latest upstream)
Master: A---B---C---X---Y---Z (X=CI/CD, Y=CI/CD, Z=dev setup)

Status: 3 commits ahead, 1 commit behind

After:
Master: A---B---C---X---Y---Z---M
\ /
D-------/

Where M = Merge commit preserving all local changes
```

All three local commits (CI/CD + dev setup) preserved! ✅

---

**Status:** Ready to commit and test
**Documentation:** See `.github/docs/pristine-master-policy.md`
Loading
Loading