8000 Merge pull request #1 from StrandForge/base-main · StrandForge/sdk-python@10ed8d6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 10ed8d6

Browse files
sugixsugix
authored
Merge pull request #1 from StrandForge/base-main
Base main
2 parents 68740c5 + dd4f7f1 commit 10ed8d6

File tree

2 files changed

+60
-0
lines changed

2 files changed

+60
-0
lines changed

‎.github/workflows/sync-upstream.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Sync Upstream
2+
on:
3+
schedule:
4+
- cron: '0 0 * * *' # Daily sync
5+
workflow_dispatch: # Manual trigger
6+
jobs:
7+
sync:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout
11+
uses: actions/checkout@v4
12+
- name: Sync upstream
13+
run: |
14+
git config user.name "StrandForge Bot"
15+
git config user.email "bot@strandforge.ai"
16+
git remote add upstream https://github.com/strands-agents/sdk-python.git
17+
git fetch upstream
18+
git checkout base-main
19+
git merge upstream/main --no-edit
20+
git push origin base-main

‎branching-workflow.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
```mermaid
2+
graph TD
3+
%% External Repositories
4+
upstream_main[Strands Agents upstream-main]
5+
dify[Dify]
6+
smolagents[Smolagents]
7+
8+
%% StrandForge Organization Branches
9+
base_main[base-main]
10+
develop[develop]
11+
feature_visual_builder[feature/visual-builder]
12+
feature_k8s_operator[feature/k8s-operator]
13+
feature_mcp_enhancements[feature/mcp-enhancements]
14+
release_v1[release/v1.0.0]
15+
main[main]
16+
hotfix_urgent_bug[hotfix/urgent-bug]
17+
18+
%% Upstream sync and feature integration
19+
upstream_main -->|Daily Sync| base_main
20+
base_main -->|Merge Features| develop
21+
dify -->|Frontend Integration| feature_visual_builder
22+
smolagents -->|Feature Integration| feature_k8s_operator
23+
24+
%% Feature branches from develop
25+
develop --> feature_visual_builder
26+
develop --> feature_k8s_operator
27+
develop --> feature_mcp_enhancements
28+
29+
%% Merge feature branches back to develop
30+
feature_visual_builder -->|PR Merge| develop
31+
feature_k8s_operator -->|PR Merge| develop
32+
feature_mcp_enhancements -->|PR Merge| develop
33+
34+
%% Release and hotfix flow
35+
develop --> release_v1
36+
release_v1 -->|Tag| main
37+
main --> hotfix_urgent_bug
38+
hotfix_urgent_bug -->|PR Merge| main
39+
hotfix_urgent_bug -->|Cherry-pick| develop
40+
```

0 commit comments

Comments
 (0)
0