From 5c221f725a6c0339e082311b2a97da1acb9951b9 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 3 Oct 2024 11:01:03 -0400 Subject: [PATCH] jjb: babeltrace: lint: print shellcheck version - Make `print_tooling()` print the shellcheck version, if shellcheck is present - Source `scripts/common/print.sh` in the babeltrace lint jobs - Call `print_tooling` in the babeltrace lint jobs Change-Id: Ie40aaca4a060a077d1be49b18f6d9f5edcf80749 Signed-off-by: Simon Marchi --- jobs/babeltrace.yaml | 8 ++++++-- scripts/babeltrace/lint.sh | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 802330e..820dac5 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -361,7 +361,9 @@ builders: - shell: - !include-raw-escape: scripts/babeltrace/lint.sh + !include-raw-escape: + - scripts/common/print.sh + - scripts/babeltrace/lint.sh properties: - inject: @@ -540,7 +542,9 @@ builders: - shell: - !include-raw-escape: scripts/babeltrace/lint.sh + !include-raw-escape: + - scripts/common/print.sh + - scripts/babeltrace/lint.sh publishers: - workspace-cleanup: *babeltrace_publisher_workspace-cleanup_defaults diff --git a/scripts/babeltrace/lint.sh b/scripts/babeltrace/lint.sh index 5581c35..8f6fae6 100755 --- a/scripts/babeltrace/lint.sh +++ b/scripts/babeltrace/lint.sh @@ -44,6 +44,8 @@ else pip install black flake8 isort fi +print_tooling || true + exit_code=0 cd "$SRCDIR" -- 2.34.1