chore(IDX): make sure correct branch is checked out

dfinity · Dec 9, 2024 · eaeed2a · eaeed2a
1 parent 28a8a28
commit eaeed2a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.github/workflows/repo_policies.yml b/.github/workflows/repo_policies.yml
@@ -22,6 +22,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: current-repo # need to specify another path to avoid overwriting the first checkout
+          ref: ${{ github.head_ref }}
 
       - name: Python Setup
         uses: ./public-workflows/.github/workflows/python-setup
@@ -40,6 +41,7 @@ jobs:
           GH_ORG: ${{ github.repository_owner }}
           USER: ${{ github.event.pull_request.user.login }}
           REPO: ${{ github.event.repository.name }}
+          BRANCH: ${{ github.event.pull_request.head.ref }}
           MERGE_BASE_SHA: ${{ github.event.pull_request.base.sha }}
           BRANCH_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
           REPO_PATH: current-repo
diff --git a/reusable_workflows/repo_policies/bot_checks/check_bot_approved_files.py b/reusable_workflows/repo_policies/bot_checks/check_bot_approved_files.py
@@ -23,6 +23,10 @@ def get_changed_files(merge_base_sha: str, branch_head_sha: str, repo_path: Opti
     Compares the files changed in the current branch to the merge base.
     """
     commit_range = f"{merge_base_sha}..{branch_head_sha}"
+    # debug
+    current_branch = subprocess.run(["git", "branch"], capture_output=True, cwd=repo_path)
+    print(f"current branch: {current_branch.stdout}"
+    )
     result = subprocess.run(
         ["git", "diff", "--name-only", commit_range],
         capture_output=True,