Skip to content

Always use git clean -fdx #275

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 19, 2021
Merged

Always use git clean -fdx #275

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8578cf
Always use git clean -fdx
Sep 17, 2021
58dc87e
Address review: Put common Git/GitHub kwargs in a variable
Sep 17, 2021
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
20 changes: 10 additions & 10 deletions master/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,14 @@ git_branches = [
# ("https://hg.python.org/buildbot/empty", "3.4", "empty"),
]

# common Git() and GitHub() keyword arguments
GIT_KWDS = {
"timeout": 3600,
# "git clean -fdx": remove all files which are not tracked by Git,
# ignoring the .gitignore rules (ex: remove also ".o" files).
"mode": "full",
"method": "fresh",
}

c["builders"] = []
c["schedulers"] = []
Expand Down Expand Up @@ -223,15 +231,7 @@ for branch_num, (git_url, branchname, git_branch) in enumerate(git_branches):
continue

buildername = name + " " + branchname
source = Git(
repourl=git_url,
branch=git_branch,
timeout=3600,
# "git clean -fdx": remove all files which are not tracked by Git,
# ignoring the .gitignore rules (ex: remove also ".o" files).
mode="full",
method="fresh",
)
source = Git(repourl=git_url, branch=git_branch, **GIT_KWDS)
f = buildfactory(
source,
parallel=parallel.get(worker),
Expand Down Expand Up @@ -309,7 +309,7 @@ for name, worker, buildfactory, stability in BUILDERS:

pull_request_builders.append(buildername)

source = GitHub(repourl=git_url, timeout=3600, mode="full", method="clean",)
source = GitHub(repourl=git_url, **GIT_KWDS)

f = buildfactory(
source,
Expand Down