From e06d7557d76b0bb3f5f8662fb98d11904f9c3821 Mon Sep 17 00:00:00 2001 From: Tomas Pecka Date: Mon, 30 Nov 2020 09:20:18 +0100 Subject: [PATCH] Update clang-format patch-diff path After 37b6e68cdf3343dd56767a6b3036f11c4e8828c0 I forgot to update this path. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b611963..e1bbd56 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ test:worker:clang-format: image: gitlab.fit.cvut.cz:5000/algorithms-library-toolkit/infrastructure/ci-docker-images/alt-builder:latest script: - ANCESTOR=$(git merge-base origin/master HEAD) # find nearest common ancestor between HEAD and master - - git diff $ANCESTOR..HEAD | tee orig.patch | /usr/share/clang/clang-format-10/clang-format-diff.py -p1 | sed "s/+++ /+++ b\// g;s/--- /--- a\//g" > clang-format.patch + - git diff $ANCESTOR..HEAD | tee orig.patch | /usr/share/clang/clang-format-11/clang-format-diff.py -p1 | sed "s/+++ /+++ b\// g;s/--- /--- a\//g" > clang-format.patch - if [[ -s clang-format.patch ]]; then cat clang-format.patch; echo "Download the patch in the artifact directory"; false; fi # file exists and has nonzero size - fail artifacts: when: always -- 2.20.4