Skip to content

Commit ccaf4a7

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 ccaf4a7

File tree

3 files changed

+165
-156
lines changed

3 files changed

+165
-156
lines changed

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

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

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

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

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

Lines changed: 5 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
@@ -42,15 +31,15 @@ jobs:
4231
if ! git fetch origin ${{ github.head_ref }}; then
4332
echo "Unable to checkout ${{ github.head_ref }}"
4433
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:"
34+
# git remote add linux https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
35+
# git fetch --shallow-since="3 years ago" linux
36+
echo "Will run process-git-request.py with:"
4837
echo "fname = ${{ github.run_id }}"
4938
echo "target_branch = ${{ github.base_ref }}"
5039
echo "source_branch = ${{ github.head_ref }}"
5140
echo "prj_dir = ${{ github.workspace }}"
5241
echo "pull_request = ${{ github.ref }}"
5342
echo "requestor = ${{ github.actor }}"
5443
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 }}
44+
/usr/bin/python3 .github/workflows/process-git-request.py ${{ github.run_id }} ${{ github.base_ref }} \
45+
${{ github.ref }} ${{ github.workspace }} ${{ github.head_ref }} ${{ github.actor }}

0 commit comments

Comments
 (0)