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.
Status
Ready for review.
Description of Changes
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. Turnsout 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 errorchecking bash settings at the top of the file, to make future debugging
sessions more straightforward (
set -u
in particular makes mistakeslike this quite clear).
Closes #3639.
Testing
As we discovered in in #3617, we'll need to confirm this works after merge, as well as at the PR phase. Review the logic and double-check the error-checking for sanity. I SSH'd into the failed build in order to debug interactively.
Deployment
None, CI only.
Checklist
If you made changes to the server application code:
make ci-lint
) and tests (make -C securedrop test
) pass in the development containerIf you made changes to
securedrop-admin
:make -C admin test
) pass in the admin development containerIf you made changes to the system configuration:
If you made non-trivial code changes:
If you made changes to documentation:
make docs-lint
) passed locally