]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-40548: Fix "Check for source changes (pull_request)" GH Action job (GH-21806)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Mon, 10 Aug 2020 17:09:41 +0000 (10:09 -0700)
committerGitHub <noreply@github.com>
Mon, 10 Aug 2020 17:09:41 +0000 (10:09 -0700)
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 eaa551702d80fd67219c48ee6a13ffb571ca360b)

Co-authored-by: Victor Stinner <vstinner@python.org>
.github/workflows/build.yml

index 6bb52cb6a5daa5ce36ea80b58bce57dd2dcf091f..2cd2fbb686336470ef20d3960c719e938cd65ccd 100644 (file)
@@ -32,7 +32,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)'