From 61b47fc5ed0eff715a43ade35e074fa94746c03b Mon Sep 17 00:00:00 2001 From: Eduardo Almeida Date: Thu, 8 Dec 2022 18:24:27 +0000 Subject: [PATCH] ci: Calculate clang-tidy diff based on upstream/master --- utils/tests/gitlab-ci-code-linting.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/tests/gitlab-ci-code-linting.yml b/utils/tests/gitlab-ci-code-linting.yml index 723ab9314..1bd41424a 100644 --- a/utils/tests/gitlab-ci-code-linting.yml +++ b/utils/tests/gitlab-ci-code-linting.yml @@ -22,7 +22,6 @@ check-style-clang-format: variables: MPI_CI: 1 CLANG_TIDY_OUTPUT: clang-tidy-output.log - GIT_DEPTH: 0 before_script: - apt update - DEBIAN_FRONTEND=noninteractive apt install -y @@ -74,7 +73,9 @@ clang-tidy-diff: when: never - when: on_success script: - - git diff -U0 $(git merge-base --fork-point origin/$CI_DEFAULT_BRANCH) | + - git remote add upstream https://gitlab.com/nsnam/ns-3-dev.git + - git fetch upstream master + - git diff -U0 upstream/master | clang-tidy-diff-14.py -path cmake-cache/ -p1 -quiet 1> $CLANG_TIDY_OUTPUT 2> /dev/null