mark/sota
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

tooling(restep): merge neuter+add step, add fetch step

Browse source
This commit is contained in:
Mark Joshwel 2024-08-08 20:13:29 +08:00
parent 8cab070593
commit 3b8181006b
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sync.py
View file

@ -578,11 +578,6 @@ def main() -> None:
# also copy to the temp repo; step 5 (lfs migrate) wipes uncommitted changes # also copy to the temp repo; step 5 (lfs migrate) wipes uncommitted changes
copy2(REPO_SOTAIGNORE, Path(dir_temp).joinpath(".sotaignore")) copy2(REPO_SOTAIGNORE, Path(dir_temp).joinpath(".sotaignore"))
step(
desc="8 fin | neuter .gitattributes",
func=lambda: rewrite_gitattributes(Path(dir_temp)),
)
def add_and_commit() -> CompletedProcess: def add_and_commit() -> CompletedProcess:
if GH_ACT: if GH_ACT:
cp = cmd("git config user.name 'github-actions[bot]'")() cp = cmd("git config user.name 'github-actions[bot]'")()
@ -604,9 +599,13 @@ def main() -> None:
f'-am "{COMMIT_MESSAGE}" --author="{COMMIT_AUTHOR}"', f'-am "{COMMIT_MESSAGE}" --author="{COMMIT_AUTHOR}"',
)() )()
def neuter_and_commit():
rewrite_gitattributes(Path(dir_temp))
add_and_commit()
step( step(
desc="9 fin | commit", desc="8 fin | neuter .gitattributes and commit",
func=add_and_commit, func=neuter_and_commit,
) )
if r.get("remote/github") is None: if r.get("remote/github") is None:
@ -617,6 +616,11 @@ def main() -> None:
err("critical error (whuh?): couldn't add github remote") err("critical error (whuh?): couldn't add github remote")
r["remote/github"] = "github" r["remote/github"] = "github"
step(
desc=f"9 fin | fetch {r['remote/github']}",
func=cmd(f"git fetch {r['remote/github']}"),
)
push_invocation = ( push_invocation = (
f"git push {r['remote/github']} {branch} --force" f"git push {r['remote/github']} {branch} --force"
if not GH_ACT if not GH_ACT