Skip to content

Calculate merge base in changed-files action #150

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
rapids-bot merged 9 commits into from
Sep 23, 2026
Merged

Calculate merge base in changed-files action #150

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4c17480
Calculate merge base in `changed-files` action
KyleFromNVIDIA Sep 23, 2026
68ec6b9
Oops
KyleFromNVIDIA Sep 23, 2026
7612fbb
Remove quotes
KyleFromNVIDIA Sep 23, 2026
2709d11
Fetch more history
KyleFromNVIDIA Sep 23, 2026
4eae538
Debugging
KyleFromNVIDIA Sep 23, 2026
dbabef1
Remove depth limit
KyleFromNVIDIA Sep 23, 2026
1ab07be
unshallow
KyleFromNVIDIA Sep 23, 2026
db65ce5
Remove debugging
KyleFromNVIDIA Sep 23, 2026
2d74f96
Better error
KyleFromNVIDIA Sep 23, 2026
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
23 changes: 20 additions & 3 deletions changed-files/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,34 @@ runs:
- name: Get PR info
id: get-pr-info
uses: nv-gha-runners/get-pr-info@090577647b8ddc4e06e809e264f7881650ecdccf # main
- name: Fetch changed files
- name: Fetch history and compute merge base
id: fetch-history-and-compute-merge-base
shell: bash
env:
BASE_SHA: ${{ fromJSON(steps.get-pr-info.outputs.pr-info).base.sha }}
HEAD_SHA: ${{ fromJSON(steps.get-pr-info.outputs.pr-info).head.sha }}
run: |
git fetch --depth 1 origin "$BASE_SHA"
git fetch --unshallow origin "$BASE_SHA" "$HEAD_SHA"
merge_bases=()
for merge_base in $(git merge-base -a "$BASE_SHA" "$HEAD_SHA"); do
merge_bases+=("$merge_base")
done
if [[ "${#merge_bases[@]}" -gt 1 ]]; then
echo "::error::Multiple merge bases:"
for merge_base in "${merge_bases[@]}"; do
echo " $merge_base"
done
exit 1
elif [[ "${#merge_bases[@]}" -eq 0 ]]; then
echo "::error::No merge bases"
exit 1
fi
echo "merge_base=$merge_bases" | tee "$GITHUB_OUTPUT"
- name: Get changed files
id: changed-files
uses: step-security/changed-files@2e07db73e5ccdb319b9a6c7766bd46d39d304bad # v47.0.5
with:
base_sha: ${{ fromJSON(steps.get-pr-info.outputs.pr-info).base.sha }}
base_sha: ${{ steps.fetch-history-and-compute-merge-base.outputs.merge_base }}
sha: ${{ fromJSON(steps.get-pr-info.outputs.pr-info).head.sha }}
files_yaml: ${{ inputs.files_yaml }}
write_output_files: true
Expand Down
Loading