Smarter rebase on-top of github target logic#3617
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## develop #3617 +/- ##
========================================
Coverage 85.04% 85.04%
========================================
Files 37 37
Lines 2367 2367
Branches 260 260
========================================
Hits 2013 2013
Misses 290 290
Partials 64 64Continue to review full report at Codecov.
|
This will hopefully resolve issues pertaining to PRs that target non-develop branches and fail in particular ways (not to mention its not an accurate test) when rebased against develop
I was hitting super annoying issues involving embedded quotations. It seems acceptable to skip that lint check on this particular file
msheiny
force-pushed
the
DynamicallyDeterminePRTarget
branch
from
b6298df to
01b9031
Compare
Contributor
Author
|
@conorsch i rebased and removed that dangling branch 👍 .. waiting for tests to pass 🤞 |
Closed
conorsch
pushed a commit
that referenced
this pull request
Jul 14, 2018
We recently (#3617) modified the CI rebase logic to accommodate more than just the develop branch. That's good! However, the new logic assumed that the env var `CIRCLE_PULL_REQUEST` would be defined. Turns out it's only defined on PRs, which makes sense, but not during CI runs against a base branch such as "develop". Modified the rebase script to execute the main block if-and-only-if `CIRCLE_PULL_REQUEST` is set. Additionally, sprinkled in some more error checking bash settings at the top of the file, to make future debugging sessions more straightforward (`set -u` in particular makes mistakes like this quite clear). Closes #3639.
5 tasks
1 task
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ready for review
Fixes #2942
Changes proposed in this pull request:
developHow should the reviewer test this PR?
Start by populating the following env vars:
CIRCLE_PULL_REQUESTCIRCLE_BRANCH- Keep in mind that this looks like a full URL alahttps://github.com/freedomofpress/securedrop/pull/3556. You might ask, why didnt @msheiny useCIRCLE_PR_NUMBERto just grab the number like @redshiftzero suggested!!? Well unfortunately that env var only applies to forked PRs.Okay now run ..
devops/scripts/rebase-ci.sh. Make sure stuff doesnt explode. If you have dangling git changes you should get errors about a rebase.Any special considerations for deployment? Consider both:
Only affects CI. I did take note to look at the parameters from a forked PR on the github API and I'm convinced it'll work fine famous last words
Caveat -- One particular bit I am concerned about is Github API limits... its 60 per hour per host. Now I think we are safe here because we are executing on multiple builders which should change IP addresses.. but something to watch out for.