Skip to content

Commit 7ee3c93

Browse files
gvrose8192gvrose8192
committed
github actions: Use python PR check script
jira LE-2214 Obsoletes the old ruby PR check script
1 parent c053ab5 commit 7ee3c93

File tree

3 files changed

+166
-156
lines changed

3 files changed

+166
-156
lines changed

‎.github/workflows/process-git-request.py‎

Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
1+
#!/usr/bin/env python3
2+
3+
import sys
4+
import subprocess
5+
import os
6+
import re
7+
8+
def file_prepend(file, str):
9+
with open(file, 'r') as fd:
10+
contents = fd.read()
11+
new_contents = str + contents
12+
13+
# Overwrite file but now with prepended string on it
14+
with open(file, 'w') as fd:
15+
fd.write(new_contents)
16+
17+
def process_git_request(fname, target_branch, source_branch, prj_dir):
18+
retcode = 0 # presume success
19+
file = open(fname, "w")
20+
working_dir = prj_dir
21+
os.chdir(working_dir)
22+
23+
git_cmd = f"git branch"
24+
gitbr_out, gitbr_err = subprocess.Popen(git_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True).communicate()
25+
if gitbr_err:
26+
print(f"git branch returned error {gitbr_err}")
27+
else:
28+
gitbr_lines = gitbr_out.splitlines()
29+
for x in gitbr_lines:
30+
print(f"git branch output line {x}")
31+
32+
git_cmd = f"git log --oneline --no-abbrev-commit " + target_branch + ".." + source_branch
33+
print(f"git command is {git_cmd}")
34+
loglines_to_check = 13
35+
try:
36+
out, err = subprocess.Popen(git_cmd, shell=True, stdout=subprocess.PIPE,
37+
stderr=subprocess.PIPE, universal_newlines=True, encoding='latin-1').communicate()
38+
if err:
39+
print(f"Command error output is {err}")
40+
file.write(f"Command error output is {err}")
41+
file.close()
42+
return 1
43+
else:
44+
print(f"Git log line executed")
45+
46+
line_count = len(out.splitlines())
47+
print(f"Got {line_count} lines of git log output")
48+
if line_count > 3:
49+
print(f"Huge Line count {line_count}")
50+
return 0
51+
52+
return 0
53+
output_lines = out.splitlines()
54+
commit_sha = ""
55+
# we just want the commit sha IDs
56+
for x in output_lines:
57+
# print(f"This is output_lines {x}")
58+
if not bool(re.search(r'[^\x30-\x39a-fA-F]', x)): # equivalent to Ruby's !x[/\H/]
59+
continue
60+
else:
61+
y = x.split()
62+
commit_sha = str(y[0])
63+
print(f"Found a commit in line ", commit_sha)
64+
65+
git_cmd = "git show " + commit_sha
66+
gitlog_out, gitlog_err = subprocess.Popen(git_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True).communicate()
67+
68+
loglines = gitlog_out.splitlines()
69+
lines_counted = 0
70+
local_diffdiff_sha = commit_sha
71+
upstream_diffdiff_sha = ""
72+
upstream_diff = False
73+
74+
for logline in loglines:
75+
# print(f"Processing logline {commit_sha}")
76+
lines_counted += 1
77+
if lines_counted == 1:
78+
file.write("Merge Request sha: " + local_diffdiff_sha)
79+
file.write("\n")
80+
if lines_counted == 2: # email address
81+
if "ciq.com" not in logline.lower():
82+
# Bad Author
83+
s = f"error:\nBad {logline}\n"
84+
print(s)
85+
file.write(s)
86+
file.close()
87+
return retcode
88+
if lines_counted > 1:
89+
if "jira" in logline.lower():
90+
file.write("\t" + logline + "\n")
91+
92+
if "upstream-diff" in logline.lower():
93+
upstream_diff = True
94+
95+
if "commit" in logline.lower():
96+
commit_sha = re.search(r'[0-9a-f]{40}', logline)
97+
upstream_diffdiff_sha = str(commit_sha.group(0)) if commit_sha else ""
98+
print(f"Upstream : " + upstream_diffdiff_sha)
99+
if upstream_diffdiff_sha:
100+
file.write("\tUpstream sha: " + upstream_diffdiff_sha)
101+
file.write("\n")
102+
103+
if lines_counted > loglines_to_check: # Everything we need should be in the first loglines_to_check lines
104+
# print(f"Breaking after {loglines_to_check} lines of commit checking")
105+
break
106+
107+
if local_diffdiff_sha and upstream_diffdiff_sha:
108+
diff_cmd = os.path.join(os.getcwd(), ".github/workflows/diffdiff.py") + " --colour --commit " + local_diffdiff_sha
109+
# print("diffdiff: " + diff_cmd)
110+
process = subprocess.run(diff_cmd, shell=True, capture_output=True, text=True)
111+
diff_out = process.stdout
112+
diff_err = process.stderr
113+
diff_status = process.returncode
114+
115+
if diff_status != 0 and not upstream_diff:
116+
print(f"diffdiff out: " + diff_out)
117+
print(f"diffdiff err: " + diff_err)
118+
retcode = 1
119+
file.write("error:\nCommit: " + local_diffdiff_sha + " differs with no upstream tag in commit message\n")
120+
except Exception as error:
121+
print(f"Exception in git log command error {error}")
122+
123+
finally:
124+
file.close()
125+
126+
return retcode
127+
128+
first_arg, *argv_in = sys.argv[1:] # Skip script name in sys.argv
129+
130+
if len(argv_in) < 5:
131+
print("Not enough arguments: fname, target_branch, source_branch, prj_dir, pull_request, requestor")
132+
sys.exit()
133+
134+
fname = str(first_arg)
135+
fname = "tmp-" + fname
136+
# print("filename is " + fname)
137+
target_branch = str(argv_in[0])
138+
# print("target branch is " + target_branch)
139+
source_branch = str(argv_in[1])
140+
# print("source branch is " + source_branch)
141+
prj_dir = str(argv_in[2])
142+
# print("project dir is " + prj_dir)
143+
pullreq = str(argv_in[3])
144+
# print("pull request is " + pullreq)
145+
requestor = str(argv_in[4])
146+
147+
retcode = process_git_request(fname, target_branch, pullreq, prj_dir)
148+
149+
if retcode != 0:
150+
with open(fname, 'r') as fd:
151+
contents = fd.read()
152+
print(contents)
153+
sys.exit(1)
154+
else:
155+
print("Done")
156+
157+
sys.exit(0)
158+

‎.github/workflows/process-git-request.rb‎

Lines changed: 0 additions & 140 deletions
This file was deleted.

‎.github/workflows/process-pull-request.yml‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,9 @@ jobs:
1818
test:
1919

2020
runs-on: ubuntu-latest
21-
strategy:
22-
matrix:
23-
ruby-version: ['3.0']
2421

2522
steps:
2623
- uses: actions/checkout@v4
27-
- name: Set up Ruby
28-
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
29-
# change this to (see https://github.com/ruby/setup-ruby#versioning):
30-
uses: ruby/setup-ruby@v1
31-
# uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
32-
with:
33-
ruby-version: ${{ matrix.ruby-version }}
34-
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
3524
- name: Set up Python
3625
uses: actions/setup-python@v5
3726
- name: Run tests
@@ -41,16 +30,19 @@ jobs:
4130
git fetch origin ${{ github.base_ref }}
4231
if ! git fetch origin ${{ github.head_ref }}; then
4332
echo "Unable to checkout ${{ github.head_ref }}"
33+
else
34+
git checkout -b ${{ github.head_ref }} origin/${{ github.head_ref }}
35+
git checkout ${{ github.base_ref }}
4436
fi
45-
git remote add linux https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
46-
git fetch --shallow-since="3 years ago" linux
47-
echo "Will run process-git-request.rb with:"
37+
# git remote add linux https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
38+
# git fetch --shallow-since="3 years ago" linux
39+
echo "Will run process-git-request.py with:"
4840
echo "fname = ${{ github.run_id }}"
4941
echo "target_branch = ${{ github.base_ref }}"
5042
echo "source_branch = ${{ github.head_ref }}"
5143
echo "prj_dir = ${{ github.workspace }}"
5244
echo "pull_request = ${{ github.ref }}"
5345
echo "requestor = ${{ github.actor }}"
5446
cd ${{ github.workspace }}
55-
/usr/bin/ruby .github/workflows/process-git-request.rb ${{ github.run_id }} ${{ github.base_ref }} \
56-
${{ github.head_ref }} ${{ github.workspace }} ${{ github.ref }} ${{ github.actor }}
47+
/usr/bin/python3 .github/workflows/process-git-request.py ${{ github.run_id }} ${{ github.base_ref }} \
48+
${{ github.ref }} ${{ github.workspace }} ${{ github.head_ref }} ${{ github.actor }}

0 commit comments

Comments
 (0)