Skip to content

Commit 50a5001

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 50a5001

File tree

3 files changed

+159
-156
lines changed

3 files changed

+159
-156
lines changed

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

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

‎.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)