diff --git a/.ci/lib/apkbuild_linting.py b/.ci/lib/apkbuild_linting.py index 144068b3a..5fa8c76c6 100755 --- a/.ci/lib/apkbuild_linting.py +++ b/.ci/lib/apkbuild_linting.py @@ -23,9 +23,4 @@ if __name__ == "__main__": print("No APKBUILDs to lint") sys.exit(0) - result = common.run_pmbootstrap(["-q", "lint"] + packages, output_return=True) - - if len(result) > 0: - print("Linting issues found:") - print(result) - sys.exit(1) + common.run_pmbootstrap(["-q", "lint"] + packages) diff --git a/.ci/lib/common.py b/.ci/lib/common.py index f3f0507a1..6c21aaab2 100755 --- a/.ci/lib/common.py +++ b/.ci/lib/common.py @@ -44,14 +44,11 @@ def commit_message_has_string(needle): return needle in run_git(["show", "-s", "--format=full", "HEAD"]) -def run_pmbootstrap(parameters, output_return=False): +def run_pmbootstrap(parameters): """ Run pmbootstrap with the pmaports dir as --aports """ cmd = ["pmbootstrap", "--aports", get_pmaports_dir()] + parameters - stdout = subprocess.PIPE if output_return else None - result = subprocess.run(cmd, stdout=stdout, universal_newlines=True) + result = subprocess.run(cmd, universal_newlines=True) result.check_returncode() - if output_return: - return result.stdout def get_upstream_branch():