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

Jump to bottom

Ticket31314 29879 #1219

Closed
wants to merge 7 commits into from
Closed

Ticket31314 29879 #1219

wants to merge 7 commits into from

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@teor2345 @coveralls @torproject-pusher
@teor2345
Copy link
Contributor

@teor2345 teor2345 commented Aug 8, 2019

No description provided.

teor2345 added 2 commits Aug 8, 2019
@teor2345
scripts/git: add TOR_PUSH_DELAY to git-push-all.sh
d6202d3 
Add a TOR_PUSH_DELAY variable to git-push-all.sh, which makes the script
push master and maint branches with a delay between each branch. These
delays trigger the CI jobs in a set order, which should show the most
likely failures first.

Also:
* make pushes atomic by default, and
* make the script pass any command-line arguments to git push.

Closes ticket 29879.
@teor2345
scripts/git: Cleanup and fix minor git scripts issues
1f6f451 
Fix typos, clean up formatting, rewrite some comments, add headings.

Preparation for 31314.
@coveralls
Copy link

@coveralls coveralls commented Aug 9, 2019 •
edited

Pull Request Test Coverage Report for Build 5899

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 532 unchanged lines in 8 files lost coverage.
  • Overall coverage decreased (-0.002%) to 62.83%
Files with Coverage Reduction New Missed Lines %
src/core/or/versions.c 1 94.47%
src/feature/hs/hs_common.c 1 85.28%
src/feature/hs/hs_service.c 1 73.56%
src/feature/dircache/dircache.c 49 70.67%
src/feature/rend/rendmid.c 57 30.15%
src/core/or/circuitpadding.c 63 92.37%
src/feature/dircommon/directory.c 84 61.89%
src/core/or/relay.c 276 51.33%
Totals Coverage Status
Change from base Build 5773: -0.002%
Covered Lines: 47261
Relevant Lines: 75221
💛 - Coveralls

teor2345 added 4 commits Aug 12, 2019
@teor2345
scripts/git: Add test branch support to the git scripts
a3400b1 
Add a -t <test-branch-prefix> argument to git-merge-forward.sh and
git-push-all.sh, which makes these scripts create, merge forward, and
push test branches.

Add a -r <remote-name> argument to git-push-all.sh, so the script can
push test branches to a personal remote.

Closes ticket 31314.
@teor2345
scripts/git: Allow git-merge-forward.sh to re-use existing test branches
6fc8862 
Add a -u argument to git-merge-forward.sh, so that the script can
re-use existing test branches after a merge failure and fix.

Part of 31314.
@teor2345
scripts/git: Make the git push command and args configurable
e6a10c9 
TOR_GIT_PUSH provides the git push command and default arguments.

Also fix handling of git-push-all.sh script arguments and arguments that
are passed through to $TOR_GIT_PUSH, using a "--" argument as a separator.

Fix on 29879.
@teor2345
scripts/git: Let git-push-all.sh skip unchanged test branches
52b88c5 
Skip test branches that are the same as remote maint/release/master
branches.

Add a TOR_PUSH_SAME and -s argument to git-push-all.sh to change this
default.

Part of 31314.
@teor2345 teor2345 force-pushed the ticket31314_29879 branch from fc8face to 52b88c5 Aug 12, 2019
@teor2345
fixup! scripts/git: Let git-push-all.sh skip unchanged test branches
5550989
@torproject-pusher torproject-pusher deleted the branch torproject:master May 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment