I'm not confident that the PR filter in the last commit will work, so just split into two workflows for now.