change detection

Author: AA-Turner

.github/workflows/reusable-context.yml

@@ -68,11 +68,18 @@ jobs:
           }}
 
     - run: git remote -vvv
-    - run: echo ${{ github.ref }}
-    - run: echo ${{ github.repository }}
-    - run: echo ${{ github.repository }}
-    - run: echo ${{ github.event.pull_request.head.sha }}
-    - run: echo ${{ env.GITHUB_HEAD_REF }}
+    - run: git -P branch -v
+    - run: git -P branch -r -v
+    - run: echo ref= ${{ github.ref }}
+    - run: echo sha= ${{ github.sha }}
+    - run: echo repository= ${{ github.repository }}
+    - run: echo event.pull_request.head.sha= ${{ github.event.pull_request.head.sha }}
+    - run: echo head_ref= ${{ github.head_ref }}
+    - run: echo base_ref= ${{ github.base_ref }}
+    - run: echo env.GITHUB_HEAD_REF= ${{ env.GITHUB_HEAD_REF }}
+    - run: echo $GITHUB_HEAD_REF
+    - run: echo $GITHUB_BASE_REF
+    - run: echo head sha or sha = ${{ github.event.pull_request.head.sha || github.sha }}
 
     # Adapted from https://github.com/actions/checkout/issues/520#issuecomment-1167205721
     - name: Fetch commits to get branch diff
@@ -96,6 +103,8 @@ jobs:
         commits: ${{ github.event.pull_request.commits }}
         refspec_base: '+${{ github.event.pull_request.base.sha }}:remotes/origin/${{ github.event.pull_request.base.ref }}'
         refspec_pr: '+${{ github.event.pull_request.head.sha }}:remotes/origin/${{ github.event.pull_request.head.ref }}'
+    - run: git -P branch -v
+    - run: git -P branch -r -v
 
     # We only want to run tests on PRs when related files are changed,
     # or when someone triggers a manual workflow run.
@@ -104,6 +113,8 @@ jobs:
       run: python Tools/build/compute-changes.py
       env:
         GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+        CCF_TARGET_REF: ${{ github.base_ref || github.event.repository.default_branch }}
+        CCF_HEAD_REF: ${{ github.event.pull_request.head.sha || github.sha }}
 
     - name: Compute hash for config cache key
       id: config-hash

Tools/build/compute-changes.py

@@ -59,9 +59,7 @@ def compute_changes() -> None:
     target_branch, head_branch = git_branches()
     if target_branch and head_branch:
         # Getting changed files only makes sense on a pull request
-        files = get_changed_files(
-            f"origin/{target_branch}", f"origin/{head_branch}"
-        )
+        files = get_changed_files(target_branch, head_branch)
         outputs = process_changed_files(files)
     else:
         # Otherwise, just run the tests
@@ -90,14 +88,14 @@ def compute_changes() -> None:
 
 
 def git_branches() -> tuple[str, str]:
-    target_branch = os.environ.get("GITHUB_BASE_REF", "")
-    target_branch = target_branch.removeprefix("refs/heads/")
-    print(f"target branch: {target_branch!r}")
+    target_ref = os.environ.get("CCF_TARGET_REF", "")
+    target_ref = target_ref.removeprefix("refs/heads/")
+    print(f"target ref: {target_ref!r}")
 
-    head_branch = os.environ.get("GITHUB_HEAD_REF", "")
-    head_branch = head_branch.removeprefix("refs/heads/")
-    print(f"head branch: {head_branch!r}")
-    return target_branch, head_branch
+    head_ref = os.environ.get("CCF_HEAD_REF", "")
+    head_ref = head_ref.removeprefix("refs/heads/")
+    print(f"head ref: {head_ref!r}")
+    return f"origin/{target_ref}", head_ref
 
 
 def get_changed_files(
@@ -109,6 +107,11 @@ def get_changed_files(
     changed_files_result = subprocess.run(
         args, stdout=subprocess.PIPE, check=True, encoding="utf-8"
     )
+    print()
+    print()
+    print(changed_files_result.stdout.strip())
+    print()
+    print()
     changed_files = changed_files_result.stdout.strip().splitlines()
     return frozenset(map(Path, filter(None, map(str.strip, changed_files))))