Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ADAP-1184: Create scripts to streamline moving branches into the monorepo and backporting bug fixes to legacy repos #462

Merged
merged 23 commits into from
Feb 18, 2025
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1c682a0
simplify github workflows and templates to reflect this repo migratin…
mikealfare Jan 11, 2025
b4beafd
update documentation to point to the new repo
mikealfare Jan 11, 2025
933bd05
remove pull request related artifacts as no more changes will be push…
mikealfare Jan 11, 2025
ac30f83
create a script to migrate feature branches from legacy adapter repos…
mikealfare Jan 13, 2025
6427ec3
create a script to migrate feature branches from legacy adapter repos…
mikealfare Jan 13, 2025
dc479f3
create a script to migrate feature branches from legacy adapter repos…
mikealfare Jan 13, 2025
00b79e4
create a script to migrate feature branches from legacy adapter repos…
mikealfare Jan 13, 2025
bdadd48
create a script to migrate feature branches from legacy adapter repos…
mikealfare Jan 13, 2025
1089d56
create a script to migrate feature branches from legacy adapter repos…
mikealfare Jan 13, 2025
de3ec9a
update the contributing guide to reference the branch migration script
mikealfare Jan 13, 2025
e492dcb
Merge branch 'main' into monorepo/migrate-branch-script
mikealfare Jan 13, 2025
91c3d89
Merge branch 'main' into monorepo/migrate-branch-script
mikealfare Jan 14, 2025
0b78921
Merge branch 'main' into monorepo/migrate-branch-script
mikealfare Jan 29, 2025
b15ea69
Merge branch 'main' into monorepo/migrate-branch-script
mikealfare Jan 30, 2025
213d20a
add rough draft of backport script
mikealfare Feb 5, 2025
6efba2e
update the backport script to run in the monorepo
mikealfare Feb 5, 2025
b0d437c
Merge branch 'main' into monorepo/migrate-branch-script
mikealfare Feb 12, 2025
9a0e9f3
update scripts for migrating branches and commits to and from the mon…
mikealfare Feb 12, 2025
92e09d2
Merge branch 'main' into monorepo/migrate-branch-script
mikealfare Feb 13, 2025
09e23fa
Merge branch 'main' into monorepo/migrate-branch-script
mikealfare Feb 14, 2025
73076fd
Merge branch 'main' into monorepo/migrate-branch-script
mikealfare Feb 14, 2025
8a2bed5
Merge branch 'main' into monorepo/migrate-branch-script
mikealfare Feb 14, 2025
a4fd0cf
Merge branch 'main' into monorepo/migrate-branch-script
mikealfare Feb 15, 2025
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
Prev Previous commit
Next Next commit
create a script to migrate feature branches from legacy adapter repos…
… and forks
mikealfare committed Jan 13, 2025
commit 1089d56d8b167d16ef62753d19764646c4c32c81
2 changes: 1 addition & 1 deletion scripts/migrate-branch.sh
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ git remote add adapter https://github.com/$user/$repo.git || true # this may al

# update your feature branch against dbt-adapters@main and potentially resolve conflicts
git fetch adapter
git rebase main adapter/$branch --strategy=ours
git rebase main adapter/$branch

# create a branch in the dbt-adapters repo for your feature branch from the adapter repo
git checkout -b $repo/$branch # prefixing <adapter>/ namespaces your feature branch in the new repo