Skip to content

Commit 0ff541d

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 0ff541d

File tree

3 files changed

+150
-156
lines changed

3 files changed

+150
-156
lines changed

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

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

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