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

git: use `checkout -B` rather than `branch -M` #3537

Merged
merged 1 commit into from Aug 21, 2017

Conversation

Projects
None yet
3 participants
@mathstuf
Contributor

mathstuf commented Aug 17, 2017

Some projects require local branches to exist (namely master) in order
to run their tests. The rename step takes away the master branch from
the checkout on the build machine and can cause tests to fail. Rather
than renaming the current branch, checkout a new branch, overwriting any
branch of the previous name.

Contributor Checklist:

  • I have updated the unit tests
  • I have created a file in the master/buildbot/newsfragment directory (and read the README.txt in that directory)
  • I have updated the appropriate documentation

Not sure if there's relevant documentation as to how the local branch gets made anywhere or not.

git: use `checkout -B` rather than `branch -M`
Some projects require local branches to exist (namely `master`) in order
to run their tests. The rename step takes away the `master` branch from
the checkout on the build machine and can cause tests to fail. Rather
than renaming the current branch, checkout a new branch, overwriting any
branch of the previous name.
@mention-bot

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot Aug 17, 2017

@mathstuf, thanks for your PR! By analyzing the history of the files in this pull request, we identified @tardyp, @srinupiits and @in3xes to be potential reviewers.

mention-bot commented Aug 17, 2017

@mathstuf, thanks for your PR! By analyzing the history of the files in this pull request, we identified @tardyp, @srinupiits and @in3xes to be potential reviewers.

@mention-bot

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot Aug 17, 2017

@mathstuf, thanks for your PR! By analyzing the history of the files in this pull request, we identified @tardyp, @srinupiits and @in3xes to be potential reviewers.

mention-bot commented Aug 17, 2017

@mathstuf, thanks for your PR! By analyzing the history of the files in this pull request, we identified @tardyp, @srinupiits and @in3xes to be potential reviewers.

@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Aug 17, 2017

Codecov Report

Merging #3537 into master will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3537   +/-   ##
=======================================
  Coverage   88.27%   88.27%           
=======================================
  Files         323      323           
  Lines       33780    33780           
=======================================
  Hits        29818    29818           
  Misses       3962     3962
Impacted Files Coverage Δ
master/buildbot/steps/source/git.py 92.93% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5d12e5f...5f995bf. Read the comment docs.

codecov bot commented Aug 17, 2017

Codecov Report

Merging #3537 into master will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3537   +/-   ##
=======================================
  Coverage   88.27%   88.27%           
=======================================
  Files         323      323           
  Lines       33780    33780           
=======================================
  Hits        29818    29818           
  Misses       3962     3962
Impacted Files Coverage Δ
master/buildbot/steps/source/git.py 92.93% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5d12e5f...5f995bf. Read the comment docs.

@tardyp

This comment has been minimized.

Show comment
Hide comment
@tardyp

tardyp Aug 18, 2017

Member

looks good. keeping it open to let others object if necessary

Member

tardyp commented Aug 18, 2017

looks good. keeping it open to let others object if necessary

@tardyp tardyp merged commit be6a80a into buildbot:master Aug 21, 2017

31 checks passed

bb Build done.
Details
bb/coverage/2.7/tw:latest/sqla:latest/db:sqlite:// Build done.
Details
bb/coverage/3.5/tw:latest/sqla:latest/db:sqlite:// Build done.
Details
bb/docs/2.7/tw:latest/sqla:latest/db:sqlite:// Build done.
Details
bb/flake8/2.7/tw:latest/sqla:latest/db:sqlite:// Build done.
Details
bb/flake8/3.5/tw:latest/sqla:latest/db:sqlite:// Build done.
Details
bb/isort/2.7/tw:latest/sqla:latest/db:sqlite:// Build done.
Details
bb/js/2.7/tw:latest/sqla:latest/db:sqlite:// Build done.
Details
bb/pylint/2.7/tw:latest/sqla:latest/db:sqlite:// Build done.
Details
bb/smokes/2.7/tw:latest/sqla:latest/db:sqlite:// Build done.
Details
bb/smokes/3.5/tw:latest/sqla:latest/db:sqlite:// Build done.
Details
bb/trial/2.7/tw:14.0.2/sqla:latest/db:sqlite:// Build done.
Details
bb/trial/2.7/tw:15.4.0/sqla:latest/db:sqlite:// Build done.
Details
bb/trial/2.7/tw:15.5.0/sqla:0.8.0/db:sqlite:// Build done.
Details
bb/trial/2.7/tw:15.5.0/sqla:latest/db:sqlite:// Build done.
Details
bb/trial/2.7/tw:latest/sqla:latest/db:mysql+mysqldb://travis@127.0.0.1/bbtest Build done.
Details
bb/trial/2.7/tw:latest/sqla:latest/db:sqlite:// Build done.
Details
bb/trial/2.7/tw:latest/sqla:latest/db:sqlite:////tmp/test_db.sqlite Build done.
Details
bb/trial/3.4/tw:latest/sqla:latest/db:sqlite:// Build done.
Details
bb/trial/3.6/tw:latest/sqla:latest/db:sqlite:// Build done.
Details
bb/trial_worker/2.6/tw:14.0.2/sqla:latest/db:sqlite:// Build done.
Details
bb/trial_worker/2.6/tw:15.4.0/sqla:latest/db:sqlite:// Build done.
Details
bb/trial_worker/2.7/tw:10.2.0/sqla:latest/db:sqlite:// Build done.
Details
bb/trial_worker/2.7/tw:11.1.0/sqla:latest/db:sqlite:// Build done.
Details
bb/trial_worker/2.7/tw:12.2.0/sqla:latest/db:sqlite:// Build done.
Details
bb/trial_worker/2.7/tw:13.2.0/sqla:latest/db:sqlite:// Build done.
Details
ci/circleci Your tests passed on CircleCI!
Details
codecov/patch 100% of diff hit (target 88.27%)
Details
codecov/project 88.27% (+0%) compared to 5d12e5f
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@mathstuf mathstuf deleted the mathstuf:checkout-over-rename-branch branch Aug 21, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment