From 4a38a8b78e0e9563a8a4d5d7211a1e3df153d32c Mon Sep 17 00:00:00 2001 From: Heshdude Date: Sat, 8 Aug 2020 23:53:04 +0530 Subject: [PATCH 1/3] Adding imprivements for a test --- installers/hlf/installer.toml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/installers/hlf/installer.toml b/installers/hlf/installer.toml index badb1fb..de80c60 100644 --- a/installers/hlf/installer.toml +++ b/installers/hlf/installer.toml @@ -7,17 +7,16 @@ description = "Hyperledger Fabric" sh = """ if ! command -v docker then - @warn "docker could not be found" + @warn "Docker could not be found" curl https://installer.to/docker | bash else - @info "docker found" + @info "Docker found" fi -@info "downloading Fabric........" +@info "Downloading Fabric........" curl -sSL http://bit.ly/2ysbOFE -o bootstrap.sh chmod 755 ./bootstrap.sh @sudo bash ./bootstrap.sh @sudo cp ./fabric-samples/bin/* /usr/local/bin - """ From a654fc41b1665d5d843e39ec30b307cb3fe33104 Mon Sep 17 00:00:00 2001 From: Heshdude Date: Sun, 9 Aug 2020 00:24:09 +0530 Subject: [PATCH 2/3] Adding improvements to automation flow --- .github/workflows/deploy.yml | 5 +---- generate.py | 11 +++-------- generate.sh | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 12 deletions(-) create mode 100755 generate.sh diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a3f9433..3762dda 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,10 +17,7 @@ jobs: PREFIX_FILTER: | installers - name: Generate installers, update README.md & installers.toml - run: | - pip install toml - pip install pytablewriter - python generate.py ${{ env.GIT_DIFF }} + run: ./generate.sh ${{ env.GIT_DIFF }} if: env.GIT_DIFF - name: Minify generated installers run: ./minify.sh ${{ env.GIT_DIFF }} diff --git a/generate.py b/generate.py index c302405..bbf5b78 100644 --- a/generate.py +++ b/generate.py @@ -31,7 +31,7 @@ def update_readme(summary): curl = "Yes" if "curl" in installers else "No" url = "https://installer.to/"+tool_shortname value_matrix.append([name, apt, yum, pacman, apk, dnf, curl, url]) - print(value_matrix) + writer.value_matrix = value_matrix table_md = writer.dumps() try: @@ -46,23 +46,20 @@ def update_readme(summary): readme_md.write(readme) readme_md.close() except Error as e: - print(e) + logging.error('Error occurred when trying to update README.md, error: '+ e) def update_summary(name, shortname, description, installers): try: with open("./installers.toml", "r+") as installer_summary: summaary = installer_summary.read() - print (summaary) parsed_summary_toml = toml.loads(summaary) - print (parsed_summary_toml) if shortname not in parsed_summary_toml: parsed_summary_toml[shortname] = {} parsed_summary_toml[shortname]['name'] = name parsed_summary_toml[shortname]['name'] = name parsed_summary_toml[shortname]['description'] = description parsed_summary_toml[shortname]['installers'] = ",".join(installers) - print (parsed_summary_toml) installer_summary.seek(0) # sets point at the beginning of the file installer_summary.truncate() # Clear previous content installer_summary.write(toml.dumps(parsed_summary_toml)) @@ -70,8 +67,7 @@ def update_summary(name, shortname, description, installers): update_readme(parsed_summary_toml) except IOError as e: - print ("Error", e) - pass + logging.error('Error occurred when trying to update installers.toml, error: '+ e) def get_method_case(method): if method in methods: @@ -167,7 +163,6 @@ def generate(path): installer_sh.close() update_summary(parsed_toml['name'], parsed_toml['shortname'], parsed_toml['description'], installer_methods) - print("installer_methods",installer_methods) except IOError as x: if x.errno == errno.EACCES: diff --git a/generate.sh b/generate.sh new file mode 100755 index 0000000..bfae5c2 --- /dev/null +++ b/generate.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +X=() + +for word in "$@"; do + X+=$(dirname "$word " | cut -d "/" -f "1 2")" " +done + +CHANGED=$(echo $X | tr ' ' '\n' | sort | uniq | xargs) + +echo "generating for $CHANGED" +#shellspec $CHANGED +#pip install toml +#pip install pytablewriter +python generate.py $CHANGED From b46d93a3fc51dd0dd42700e25660d124cc081ea0 Mon Sep 17 00:00:00 2001 From: Heshdude Date: Sun, 9 Aug 2020 00:29:52 +0530 Subject: [PATCH 3/3] Enabling pip installs again --- generate.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/generate.sh b/generate.sh index bfae5c2..43ca4b3 100755 --- a/generate.sh +++ b/generate.sh @@ -9,7 +9,6 @@ done CHANGED=$(echo $X | tr ' ' '\n' | sort | uniq | xargs) echo "generating for $CHANGED" -#shellspec $CHANGED -#pip install toml -#pip install pytablewriter +pip install toml +pip install pytablewriter python generate.py $CHANGED