From 2f43845f78328194d7a4a6e0b3121f8c5ea21d13 Mon Sep 17 00:00:00 2001 From: Paul Bauer Date: Thu, 30 Apr 2020 14:03:15 +0200 Subject: [PATCH] Fix incorrect header and linter scripts Wrong grep flag meant that messages have not been printed. Change-Id: I74b2088a12753d584929f9aa75ed915d400d8091 --- admin/containers/utility.py | 1 + admin/gitlab-ci/lint.gitlab-ci.yml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/admin/containers/utility.py b/admin/containers/utility.py index 9dd9cf34ef..b556f85292 100644 --- a/admin/containers/utility.py +++ b/admin/containers/utility.py @@ -1,3 +1,4 @@ +# # This file is part of the GROMACS molecular simulation package. # # Copyright (c) 2020, by the GROMACS development team, led by diff --git a/admin/gitlab-ci/lint.gitlab-ci.yml b/admin/gitlab-ci/lint.gitlab-ci.yml index 5e485d5903..2d56adecc3 100644 --- a/admin/gitlab-ci/lint.gitlab-ci.yml +++ b/admin/gitlab-ci/lint.gitlab-ci.yml @@ -64,7 +64,7 @@ clang-tidy:test: - echo "Revision used for branch point is $REV" - git show -s $REV - RUN_CLANG_TIDY=run-clang-tidy-$COMPILER_MAJOR_VERSION bash admin/clang-tidy.sh check --parallel=$KUBERNETES_CPU_LIMIT --warnings=clang-tidy.log --rev=$REV -B=$BUILD_DIR - - grep -iq "found code issues" clang-tidy.log | tee code-lint.txt || true + - grep -i "found code issues" clang-tidy.log | tee code-lint.txt || true - if [ -s code-lint.txt ] ; then echo "clang-tidy.sh found issues"; exit 1; fi artifacts: when: on_failure @@ -96,7 +96,7 @@ clang-format: - echo "Revision used for branch point is $REV" - git show -s $REV - CLANG_FORMAT=clang-format-$COMPILER_MAJOR_VERSION admin/clang-format.sh check --rev=$REV --warnings=clang-format.log - - grep -iq "needs formatting" clang-format.log | tee formatting.txt || true + - grep -i "needs formatting" clang-format.log | tee formatting.txt || true - if [ -s formatting.txt ] ; then echo "clang-format.sh found issues"; exit 1; fi artifacts: when: on_failure @@ -126,8 +126,8 @@ copyright-check: - echo "Revision used for branch point is $REV" - git show -s $REV - admin/copyright.sh check --rev=$REV --warnings=copyright.log - - grep -iq "copyright year" copyright.log | tee years.log || true - - grep -iq "copyright header" copyright.log | tee headers.log || true + - grep -i "copyright year" copyright.log | tee years.log || true + - grep -i "copyright header" copyright.log | tee headers.log || true - if [[ -s years.log || -s headers.log ]] ; then echo "Copyright information needs updating" ; exit 1 ; -- 2.22.0