Skip to content

Commit b0ccf30

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 b0ccf30

File tree

3 files changed

+165
-156
lines changed

3 files changed

+165
-156
lines changed

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

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

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

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

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

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,15 @@ 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
26+
- name: Set Locale
27+
run: |
28+
sudo locale-gen en_US.UTF-8
29+
sudo update-locale LANG=en_US.UTF-8
3730
- name: Run tests
3831
run: |
3932
/usr/bin/pip3 install gitPython
@@ -42,15 +35,15 @@ jobs:
4235
if ! git fetch origin ${{ github.head_ref }}; then
4336
echo "Unable to checkout ${{ github.head_ref }}"
4437
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:"
38+
# git remote add linux https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
39+
# git fetch --shallow-since="3 years ago" linux
40+
echo "Will run process-git-request.py with:"
4841
echo "fname = ${{ github.run_id }}"
4942
echo "target_branch = ${{ github.base_ref }}"
5043
echo "source_branch = ${{ github.head_ref }}"
5144
echo "prj_dir = ${{ github.workspace }}"
5245
echo "pull_request = ${{ github.ref }}"
5346
echo "requestor = ${{ github.actor }}"
5447
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 }}
48+
/usr/bin/python3 -X utf-8 .github/workflows/process-git-request.py ${{ github.run_id }} ${{ github.base_ref }} \
49+
${{ github.ref }} ${{ github.workspace }} ${{ github.head_ref }} ${{ github.actor }}

0 commit comments

Comments
 (0)