Skip to content

Commit 61e6050

Browse files
committed
github actions: validate-kernel-commits: Clone kernel-src-tree-tools
We are using two scripts from that repo and there will be more. Just clone the whole thing instead of fetching scripts one by one.
1 parent e1c5baf commit 61e6050

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

.github/workflows/validate-kernel-commits.yml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
run: |
2424
git fetch origin ${{ github.base_ref }}:${{ github.base_ref }}
2525
26-
- name: Download check_kernel_commits.py
27-
run: |
28-
curl -sL \
29-
https://raw.githubusercontent.com/ctrliq/kernel-src-tree-tools/mainline/check_kernel_commits.py \
30-
-o check_kernel_commits.py
31-
chmod +x check_kernel_commits.py
26+
- name: Checkout kernel-src-tree-tools
27+
uses: actions/checkout@v4
28+
with:
29+
repository: ctrliq/kernel-src-tree-tools
30+
ref: 'mainline'
31+
path: kernel-src-tree-tools
3232

3333
- name: Set up Python
3434
uses: actions/setup-python@v5
@@ -37,9 +37,10 @@ jobs:
3737

3838
- name: Run upstream fixes check
3939
id: check-kernel-commits
40+
working-directory: kernel-src-tree-tools
4041
run: |
4142
set +e # Don't exit on error, we want to capture the output
42-
python3 check_kernel_commits.py --repo . --pr_branch "${{ github.head_ref }}" --base_branch "${{ github.base_ref }}" --markdown --check-cves | tee result.txt
43+
python3 check_kernel_commits.py --repo .. --pr_branch "${{ github.head_ref }}" --base_branch "${{ github.base_ref }}" --markdown --check-cves | tee ../result.txt
4344
EXIT_CODE=$?
4445
4546
# Check if the script failed
@@ -52,7 +53,7 @@ jobs:
5253
# 1. Verify the success message exists
5354
# 2. If it exists, check if there are any OTHER lines (which would indicate issues)
5455
# 3. If success message doesn't exist, that's also a finding
55-
if grep -q "All referenced commits exist upstream and have no Fixes: tags." result.txt; then
56+
if grep -q "All referenced commits exist upstream and have no Fixes: tags." ../result.txt; then
5657
# Success message found, check if there are any other lines
5758
LINE_COUNT=$(wc -l < ../ckc_result.txt)
5859
if [ "$LINE_COUNT" -gt 1 ]; then
@@ -92,18 +93,12 @@ jobs:
9293
./configure
9394
make -j$(nproc)
9495
95-
- name: Download run_interdiff.py
96-
run: |
97-
curl -sL \
98-
https://raw.githubusercontent.com/ctrliq/kernel-src-tree-tools/mainline/run_interdiff.py \
99-
-o run_interdiff.py
100-
chmod +x run_interdiff.py
101-
10296
- name: Run interdiff check
10397
id: interdiff
98+
working-directory: kernel-src-tree-tools
10499
run: |
105100
set +e # Don't exit on error, we want to capture the output
106-
python3 run_interdiff.py --repo . --pr_branch "${{ github.head_ref }}" --base_branch "${{ github.base_ref }}" --markdown --interdiff ../patchutils/src/interdiff | tee interdiff_result.txt
101+
python3 run_interdiff.py --repo .. --pr_branch "${{ github.head_ref }}" --base_branch "${{ github.base_ref }}" --markdown --interdiff ../patchutils/src/interdiff | tee ../interdiff_result.txt
107102
EXIT_CODE=$?
108103
109104
# Check if the script failed
@@ -116,7 +111,7 @@ jobs:
116111
# 1. Verify the success message exists
117112
# 2. If it exists, check if there are any OTHER lines (which would indicate differences)
118113
# 3. If success message doesn't exist, that's also a difference
119-
if grep -q "All backported commits match their upstream counterparts." interdiff_result.txt; then
114+
if grep -q "All backported commits match their upstream counterparts." ../interdiff_result.txt; then
120115
# Success message found, check if there are any other lines
121116
LINE_COUNT=$(wc -l < ../interdiff_result.txt)
122117
if [ "$LINE_COUNT" -gt 1 ]; then

0 commit comments

Comments
 (0)