Skip to content

ci: include target branch include/dt-bindings, fix, and coditional #2899

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 3 commits into from
Aug 18, 2025
Merged

ci: include target branch include/dt-bindings, fix, and coditional #2899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0687d06
ci: Fix DTS file list missing space
gastmaier Aug 18, 2025
7348748
.github: Don't run second stage on pull_request
gastmaier Aug 18, 2025
ea402e5
.github: checks: checkout target branch include files
gastmaier Aug 18, 2025
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: 18 additions & 5 deletions .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,15 @@ jobs:

git checkout $head_sha -- ci/build.sh

# Only Documentation/devicetree/bindings/**/.yaml (touched) and
# include/dt-bindings/**/.h (touched and only on source branch) files
# are checked-out, in the case of other changes the check may falsely
# fail. Please, when doing heavy dt bindings work, target the
# upstream mirrors

files=$(git diff --diff-filter=ACM --no-renames --name-only $base_sha..$head_sha)

while read file; do
# Only Documentation/devicetree/bindings/**/.yaml and
# include/dt-bindings/**/.h files are checked-out, in the case of
# other changes the check may falsely fail.
# Please, when doing heavy dt bindings work, target the upstream
# mirrors
case "$file" in
*.yaml)
relative_file=${file#Documentation/devicetree/bindings/}
Expand All @@ -102,6 +103,18 @@ jobs:
esac
done <<< "$files"

files=$(comm -13 \
<(git ls-tree -r --name-only ${{ inputs.ref_branch }} include/dt-bindings | sort) \
<(git ls-tree -r --name-only $head_sha include/dt-bindings | sort))

while read file; do
case "$file" in
*.h)
git checkout $head_sha -- $file
;;
esac
done <<< "$files"

- name: Check dt-bindings
if: ${{ !cancelled() && env.fatal != 'true' }}
run: |
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/top-level.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ jobs:
assert_labels
conditional_xlnx:
if: |
(github.event_name == 'push' && startsWith(github.ref_name, 'ci/') || github.ref_name == 'main') ||
(github.event_name == 'pull_request' && startsWith(github.base_ref, 'ci/') || github.ref_name == 'main')
(github.event_name == 'push' && startsWith(github.ref_name, 'ci/') || github.ref_name == 'main')
runs-on: [self-hosted, v1]
needs: [assert_checks]
steps:
Expand Down Expand Up @@ -206,8 +205,7 @@ jobs:
assert_labels
conditional_rpi:
if: |
(github.event_name == 'push' && startsWith(github.ref_name, 'rpi-')) ||
(github.event_name == 'pull_request' && startsWith(github.base_ref, 'rpi-'))
(github.event_name == 'push' && startsWith(github.ref_name, 'rpi-'))
runs-on: [self-hosted, v1]
needs: [assert_checks]
steps:
Expand Down
2 changes: 1 addition & 1 deletion ci/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ compile_devicetree() {
done <<< "$dtsi_files"
fi

dts_files+=$(echo "$files" | grep ^arch/$ARCH/boot/dts/ | grep dts$ || true)
dts_files+=\ $(echo "$files" | grep ^arch/$ARCH/boot/dts/ | grep dts$ || true)
if [[ -z "$dts_files" ]]; then
echo "no dts on range, skipped"
return $err
Expand Down