-
Notifications
You must be signed in to change notification settings - Fork 521
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
Fix #5407: Fix Bazel CI runs on develop #5408
Conversation
This can't be easily verified until it's merged, however I have high confidence that this should fix it as we've done similar fallback syntax for env variables in the past (e.g. '||') and 'origin/develop' was the value previously used for the base commit when computing affected tests.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Self-reviewed changes.
@adhiamboperes PTAL with priority as this will block all merged PRs from passing (it doesn't block PR merging or PR CI workflows since that part is still configured correctly). |
Enabling auto-merge since this seems like a straightforward fix and it'd be good to get this merged ASAP. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks!
Rerunning bazel tests since CI is stuck. |
Hi @BenHenning, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to merge this PR once the CI checks pass and you're happy with it. Thanks! |
Looks like the CI workflow change actually isn't valid:
|
Replace double quotes with single since single seems to be the proper one to use for strings in these contexts.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Self-review quotes change.
I think switching to single quotes might fix the syntax error mentioned above.
Looks like it's passing now, and I've verified that the env looks correct:
Will verify again for develop once this is merged & will update the issue. |
Explanation
Fixes #5407
This introduces a proper fallback for the base branch used for computing affected tests when off-develop:
origin/develop
(which was the same base used prior to #4929 being merged).This can't easily be verified without being merged, but I have high confidence it'll work since we've used the JavaScript
||
fallback syntax in GitHub workflowif
conditionals in the past (and the environment should be the same forenv
variables).Note that this is being fixed forward rather than reverted because the only verification is merging the PR, so it's actually faster and simpler to fix forward than to revert the original PR and re-submit a fix (which has the same likelihood of fixing CI as this fix forward).
Essential Checklist
For UI-specific PRs only
N/A -- This only affects CI infrastructure.