-
Notifications
You must be signed in to change notification settings - Fork 6
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
[ci] Fix files_changed
merge
main issues and files_changed
and check_bazel
script's base_sha
to point to HEAD~1
#32
[ci] Fix files_changed
merge
main issues and files_changed
and check_bazel
script's base_sha
to point to HEAD~1
#32
Conversation
…as well as fix check_bazel and files_changed base_sha to point to HEAD~1 when running on a main merge
Thanks @pablo-guardiola , would you mind add some inconsequential code change somewhere that would be picked-up by |
I already did that locally but I can push some "empty" changes for you to double check, not a problem. It's important that the changes land on But you can probably remove them quickly after confirming 👍 |
@@ -83,6 +83,8 @@ object Capture { | |||
dateProvider: DateProvider? = null, | |||
apiUrl: HttpUrl = defaultCaptureApiUrl, | |||
) { | |||
// TODO Adding a no-op for testing, please remove after confirming everything is good | |||
val test = true |
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.
this might break detekt, plus I agree with your statement about not polluting the repo with these changes and the TODOS since they will go into main
. How about something inconsequential that can actually stay in teh codebase? Something like a variable rename for example
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.
Sounds good to me. Let me quickly fix 👍
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.
Done 👉 ecd11ac
9eec8a1
to
ecd11ac
Compare
Follow up from #24 and #28
This PR fixes:
This is solved by fixing
files_changed
to differentiate when you are in a PR ormain
, as well as ensuringgit diff
failures are caught and reported accordingly.check_bazel
andfiles_changed
script'sbase_sha
to point toHEAD~1
when running on amain
merge. I noticed that no changes were detected even though they were present as part of the PR. Root cause was that we were diffing pointing to the same references and hence no changes. Pointing to the commit before the current one (HEAD~1
) fixes this. I've thoroughly tested locally and now changes are detected too after merging a PR.cc @murki