Skip to content

Commit a654fc4

Browse files
committed
Adding improvements to automation flow
1 parent 4a38a8b commit a654fc4

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ jobs:
1717
PREFIX_FILTER: |
1818
installers
1919
- name: Generate installers, update README.md & installers.toml
20-
run: |
21-
pip install toml
22-
pip install pytablewriter
23-
python generate.py ${{ env.GIT_DIFF }}
20+
run: ./generate.sh ${{ env.GIT_DIFF }}
2421
if: env.GIT_DIFF
2522
- name: Minify generated installers
2623
run: ./minify.sh ${{ env.GIT_DIFF }}

generate.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def update_readme(summary):
3131
curl = "Yes" if "curl" in installers else "No"
3232
url = "https://installer.to/"+tool_shortname
3333
value_matrix.append([name, apt, yum, pacman, apk, dnf, curl, url])
34-
print(value_matrix)
34+
3535
writer.value_matrix = value_matrix
3636
table_md = writer.dumps()
3737
try:
@@ -46,32 +46,28 @@ def update_readme(summary):
4646
readme_md.write(readme)
4747
readme_md.close()
4848
except Error as e:
49-
print(e)
49+
logging.error('Error occurred when trying to update README.md, error: '+ e)
5050

5151

5252
def update_summary(name, shortname, description, installers):
5353
try:
5454
with open("./installers.toml", "r+") as installer_summary:
5555
summaary = installer_summary.read()
56-
print (summaary)
5756
parsed_summary_toml = toml.loads(summaary)
58-
print (parsed_summary_toml)
5957
if shortname not in parsed_summary_toml:
6058
parsed_summary_toml[shortname] = {}
6159
parsed_summary_toml[shortname]['name'] = name
6260
parsed_summary_toml[shortname]['name'] = name
6361
parsed_summary_toml[shortname]['description'] = description
6462
parsed_summary_toml[shortname]['installers'] = ",".join(installers)
65-
print (parsed_summary_toml)
6663
installer_summary.seek(0) # sets point at the beginning of the file
6764
installer_summary.truncate() # Clear previous content
6865
installer_summary.write(toml.dumps(parsed_summary_toml))
6966
installer_summary.close()
7067

7168
update_readme(parsed_summary_toml)
7269
except IOError as e:
73-
print ("Error", e)
74-
pass
70+
logging.error('Error occurred when trying to update installers.toml, error: '+ e)
7571

7672
def get_method_case(method):
7773
if method in methods:
@@ -167,7 +163,6 @@ def generate(path):
167163

168164
installer_sh.close()
169165
update_summary(parsed_toml['name'], parsed_toml['shortname'], parsed_toml['description'], installer_methods)
170-
print("installer_methods",installer_methods)
171166

172167
except IOError as x:
173168
if x.errno == errno.EACCES:

generate.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
3+
X=()
4+
5+
for word in "$@"; do
6+
X+=$(dirname "$word " | cut -d "/" -f "1 2")" "
7+
done
8+
9+
CHANGED=$(echo $X | tr ' ' '\n' | sort | uniq | xargs)
10+
11+
echo "generating for $CHANGED"
12+
#shellspec $CHANGED
13+
#pip install toml
14+
#pip install pytablewriter
15+
python generate.py $CHANGED

0 commit comments

Comments
 (0)