Fix update-release-branch-fix.py - #566
aeisenberg merged 2 commits into
Conversation
Sorry, something went wrong.
|
Darn...failing test-packaging-javascript workflow is unrelated, but my fault. I removed the special release of the CLI that this workflow requires. I'll fix. |
Sorry, something went wrong.
adityasharad
left a comment
There was a problem hiding this comment.
How come there was no committer to begin with? Did we use the wrong email for the bot?
Sorry, something went wrong.
| # Is the given commit the automatic merge commit from when merging a PR | ||
| def is_pr_merge_commit(commit): | ||
| return commit.committer.login == 'web-flow' and len(commit.parents) > 1 | ||
| return commit.committer != None and commit.committer.login == 'web-flow' and len(commit.parents) > 1 |
There was a problem hiding this comment.
I prefer this over equality checks.
| return commit.committer != None and commit.committer.login == 'web-flow' and len(commit.parents) > 1 | |
| return commit.committer is not None and commit.committer.login == 'web-flow' and len(commit.parents) > 1 |
Sorry, something went wrong.
| import datetime | ||
| import os | ||
|
|
||
| import inspect |
There was a problem hiding this comment.
What's this for?
Sorry, something went wrong.
There was a problem hiding this comment.
I need to remove that. Left over from debugging.
Sorry, something went wrong.
This change ensures that the the script can handle commits with no committer in them. This will happen for some commits that are auto-generated during PRs.
|
OK...Still failing, even with the new CLI. The reason is different this time. With this new CLI, query and pack resolution is happening more correctly and the pack is failing to find it's library dependency codeql-javascript. In the previous version, the library path lookup was more lenient and was able to resolve the qlpack reference to the well-known codeql-javascript pack. So, I need to figure this out. I'll keep this PR open for now. |
Sorry, something went wrong.
This can be removed when 2.5.6 is released.
|
OK. This is now fixed. I had to recreate the codeql-pack1 and codeql-pack2 packs. Before, they were not properly created with their compile-time dependencies. Now they are. |
Sorry, something went wrong.
|
Still failing on this branch when I run the Update release branch workflow. I'll have to inspect more. |
Sorry, something went wrong.
|
Working now. |
Sorry, something went wrong.
This change ensures that the the script can handle
commits with no committer in them. This will happen
for some commits that are auto-generated during
PRs.
Merge / deployment checklist