8000 [3.7] bpo-40548: Fix "Check for source changes (pull_request)" GH Action job (GH-21806) by miss-islington · Pull Request #92342 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.7] bpo-40548: Fix "Check for source changes (pull_request)" GH Action job (GH-21806) #92342

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Sep 2, 2022
Merged

[3.7] bpo-40548: Fix "Check for source changes (pull_request)" GH Action job (GH-21806) #92342

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5097cd4
bpo-40548: Fix "Check for source changes (pull_request)" GH Action jo…
vstinner Aug 10, 2020
30f512f
Merge branch '3.7' into backport-eaa5517-3.7
ned-deily May 6, 2022
f258668
Merge branch '3.7' into backport-eaa5517-3.7
ned-deily May 10, 2022
a49e8b7
Resolve merge conflict
ned-deily Sep 2, 2022
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
Next Next commit
bpo-40548: Fix "Check for source changes (pull_request)" GH Action job ( 
GH-21806)

On Git 2.28, "git diff master..." (3 dots) no longer works when
"fetch --depth=1" is used, whereas it works on Git 2.26.

Replace "..." (3 dots) with ".." (2 dots) in the "git diff" command
computing the list of modified files between the base branch and the
PR branch.
(cherry picked from commit eaa5517)

Co-authored-by: Victor Stinner <vstinner@python.org>
  • Loading branch information
@vstinner @miss-islington
vstinner authored and miss-islington committed May 5, 2022
commit 5097cd46dff12c5fb7f2c37fbbf8b046fb41ece1
15 changes: 14 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,20 @@ jobs:
echo '::set-output name=run_tests::true'
else
git fetch origin $GITHUB_BASE_REF --depth=1
git diff --name-only origin/$GITHUB_BASE_REF... | grep -qvE '(\.rst$|^Doc|^Misc)' && echo '::set-output name=run_tests::true' || true
# git diff "origin/$GITHUB_BASE_REF..." (3 dots) may be more
# reliable than git diff "origin/$GITHUB_BASE_REF.." (2 dots),
# but it requires to download more commits (this job uses
# "git fetch --depth=1").
#
# git diff "origin/$GITHUB_BASE_REF..." (3 dots) works with Git
# 2.26, but Git 2.28 is stricter and fails with "no merge base".
#
# git diff "origin/$GITHUB_BASE_REF.." (2 dots) should be enough on
# GitHub, since GitHub starts by merging origin/$GITHUB_BASE_REF
# into the PR branch anyway.
#
# https://github.com/python/core-workflow/issues/373
git diff --name-only origin/$GITHUB_BASE_REF.. | grep -qvE '(\.rst$|^Doc|^Misc)' && echo '::set-output name=run_tests::true' || true
fi
build_win32:
name: 'Windows (x86)'
Expand Down
0