From c6bb2191fda3daa463da09713a5a61aa5a124644 Mon Sep 17 00:00:00 2001 From: Paul Bauer Date: Thu, 23 Apr 2020 20:24:50 +0000 Subject: [PATCH] Use branch point also for format and copyright check Change-Id: I16a9df11223426a40e6e138ee9f3793e700ae06e --- admin/gitlab-ci/lint.gitlab-ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/admin/gitlab-ci/lint.gitlab-ci.yml b/admin/gitlab-ci/lint.gitlab-ci.yml index 5eb97d21e6..e259e7d7db 100644 --- a/admin/gitlab-ci/lint.gitlab-ci.yml +++ b/admin/gitlab-ci/lint.gitlab-ci.yml @@ -55,8 +55,6 @@ clang-tidy:test: KUBERNETES_CPU_REQUEST: 2 KUBERNETES_MEMORY_LIMIT: 4Gi script: - # TODO (issue #3272) `master` is not appropriate for use on release-xxxx branches, how should we handle that? - # See discussion at https://gitlab.com/gromacs/gromacs/-/merge_requests/67 - REV=$(git fetch -q https://gitlab.com/gromacs/gromacs.git release-2020 && git show -s --pretty=format:"%h" `git merge-base --fork-point FETCH_HEAD HEAD`) - 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 @@ -82,8 +80,8 @@ clang-format: KUBERNETES_MEMORY_LIMIT: 2Gi EXTRA_INSTALLS: clang-format-$COMPILER_MAJOR_VERSION script: - - export CLANG_FORMAT=clang-format-$COMPILER_MAJOR_VERSION - - admin/clang-format.sh check --rev=HEAD^ --warnings=clang-format.log + - REV=$(git fetch -q https://gitlab.com/gromacs/gromacs.git release-2020 && git show -s --pretty=format:"%h" `git merge-base FETCH_HEAD HEAD`) + - 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 - if [ -s formatting.txt ] ; then echo "clang-format.sh found issues"; exit 1; fi artifacts: @@ -105,7 +103,8 @@ copyright-check: KUBERNETES_CPU_REQUEST: 1 KUBERNETES_MEMORY_LIMIT: 2Gi script: - - admin/copyright.sh check --rev=HEAD^ --warnings=copyright.log + - REV=$(git fetch -q https://gitlab.com/gromacs/gromacs.git release-2020 && git show -s --pretty=format:"%h" `git merge-base FETCH_HEAD HEAD`) + - 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 - if [[ -s years.log || -s headers.log ]] ; then -- 2.22.0