Refactor utils.py

1. Introduce typehints 2. Include what you use.
MariaDB · Nov 26, 2024 · b1588b1 · b1588b1
1 parent 9809769
commit b1588b1
Show file tree

Hide file tree

Showing 2 changed files with 125 additions and 143 deletions.
diff --git a/master-protected-branches/master.cfg b/master-protected-branches/master.cfg
@@ -422,9 +422,6 @@ f_tarball.addStep(
         doStepIf=lambda step: isStagingBranch(step),
     )
 )
-# f_tarball.addStep(steps.ShellSequence( commands=[
-#    util.ShellArg(command=util.Interpolate("git checkout " + "%(prop:staging_branch)s"), logfile="rebase"),
-#    util.ShellArg(command=util.Interpolate("git merge %(prop:branch)s"), logfile="rebase")], workdir="build/server", haltOnFailure="true", doStepIf=ifStagingSucceeding))
 f_tarball.addStep(
     steps.ShellCommand(
         name="cleanup", command="rm -r * .* 2> /dev/null || true", alwaysRun=True