Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/actions/scripts/common_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ git checkout main
echo "GITHUB_HEAD_REF: ${GITHUB_HEAD_REF:-}"
if [ -n "${GITHUB_HEAD_REF:-}" ] && [ "$GITHUB_HEAD_REF" != "main" ]; then
echo "Checking out $GITHUB_HEAD_REF"
git checkout "$GITHUB_HEAD_REF"
# On PRs from forks, GITHUB_HEAD_REF is the name of the branch in the forked repo, so we cannot actually checkout that branch directly.
git checkout "$GITHUB_HEAD_REF" || true
fi
git fetch origin 'refs/heads/release-line*:refs/heads/origin/release-line*' --force

Expand Down
3 changes: 2 additions & 1 deletion scripts/todo/src/checkTodos.sc
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ val fixedIssuesCurrentPR: Set[Int] = {
prNumO.fold(Set.empty[Int])({ prNum =>
val prInfo = Seq("hub", "pr", "show", "-f", "%b", prNum).!!
val branch = Seq("hub", "pr", "show", "-f", "%H", prNum).!!.trim
val commits = Seq("git", "log", s"main..$branch").!!
// When running from forks, we don't currently check the commit messages on the branch
val commits = Try(Seq("git", "log", s"main..$branch").!!).getOrElse("")
val issueCloseKeywords =
Seq("close", "closes", "closed", "fix", "fixes", "fixed", "resolve", "resolves", "resolved")
.map(w => s"($w)")
Expand Down