Skip to content

Commit 9b0cb15

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 9b0cb15

File tree

3 files changed

+156
-156
lines changed

3 files changed

+156
-156
lines changed

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

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

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

-140
This file was deleted.

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

+9-16
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 }} "ref/heads/${{ github.head_ref }}" ${{ github.actor }}

0 commit comments

Comments
 (0)