Skip to content

Commit ff54949

Browse files
committed
Keep the maintained branch current without rewriting history
The lev branch carries local fixes while upstream continues to move. A daily workflow merges upstream main, builds the merged source, and publishes only after the build succeeds. Constraint: Preserve the upstream fork relationship and MIT attribution Rejected: Rebase lev onto upstream main | project policy forbids rebasing and would rewrite maintained history Confidence: high Scope-risk: narrow Directive: Keep private repository evidence out of this public workflow and its logs Tested: git diff --check Not-tested: First scheduled GitHub Actions run Signed-off-by: chidev <[email protected]>
1 parent c8e7a3f commit ff54949

1 file changed

Lines changed: 42 additions & 0 deletions

File tree

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Sync upstream into lev
2+
3+
on:
4+
schedule:
5+
- cron: "17 4 * * *"
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: write
10+
11+
concurrency:
12+
group: sync-upstream-lev
13+
cancel-in-progress: false
14+
15+
jobs:
16+
merge-and-build:
17+
runs-on: ubuntu-latest
18+
timeout-minutes: 120
19+
steps:
20+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
21+
with:
22+
ref: lev
23+
fetch-depth: 0
24+
25+
- name: Install build dependencies
26+
run: sudo apt-get update && sudo apt-get install -y zlib1g-dev
27+
28+
- name: Merge upstream main
29+
run: |
30+
git config user.name "github-actions[bot]"
31+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
32+
git remote add upstream https://github.com/DeusData/codebase-memory-mcp.git
33+
git fetch upstream main
34+
git merge --no-edit upstream/main
35+
36+
- name: Build merged source
37+
env:
38+
MAKEFLAGS: -j6
39+
run: scripts/build.sh
40+
41+
- name: Publish lev branch
42+
run: git push origin HEAD:lev

0 commit comments

Comments
 (0)