From 25b90407b8d0bebf62e0425050ebb00363de525d Mon Sep 17 00:00:00 2001 From: Tobias Wood Date: Fri, 24 Nov 2023 14:34:31 +0000 Subject: [PATCH 01/13] Add clang-format to CI --- .gitlab-ci.yml | 2 + ci/checkformat.gitlab-ci.yml | 10 ++ .../LevenbergMarquardt/CopyrightMINPACK.txt | 110 +++++++++--------- 3 files changed, 70 insertions(+), 52 deletions(-) create mode 100644 ci/checkformat.gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5a3c00af..d28f9c726 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ # with this file, You can obtain one at http://mozilla.org/MPL/2.0/. stages: + - checkformat - buildsmoketests - smoketests - build @@ -18,6 +19,7 @@ variables: EIGEN_CI_CMAKE_GENEATOR: "Ninja" include: + - "/ci/checkformat.gitlab-ci.yml" - "/ci/smoketests.gitlab-ci.yml" - "/ci/build.gitlab-ci.yml" - "/ci/test.gitlab-ci.yml" diff --git a/ci/checkformat.gitlab-ci.yml b/ci/checkformat.gitlab-ci.yml new file mode 100644 index 000000000..fc5a7bf3c --- /dev/null +++ b/ci/checkformat.gitlab-ci.yml @@ -0,0 +1,10 @@ +checkformat:clangformat: + stage: checkformat + image: ubuntu:23.10 + before_script: + - apt-get update -y + - apt-get install -y --no-install-recommends clang-format-17 + script: + - find Eigen unsupported/Eigen -name "*" ! -name "*.txt" -type f -print0 | xargs -0 -n 1 clang-format-17 --dry-run --Werror --verbose + only: + - merge_requests diff --git a/unsupported/Eigen/src/LevenbergMarquardt/CopyrightMINPACK.txt b/unsupported/Eigen/src/LevenbergMarquardt/CopyrightMINPACK.txt index ae7984dae..7387a32fd 100644 --- a/unsupported/Eigen/src/LevenbergMarquardt/CopyrightMINPACK.txt +++ b/unsupported/Eigen/src/LevenbergMarquardt/CopyrightMINPACK.txt @@ -1,52 +1,58 @@ -Minpack Copyright Notice (1999) University of Chicago. All rights reserved - -Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the -following conditions are met: - -1. Redistributions of source code must retain the above -copyright notice, this list of conditions and the following -disclaimer. - -2. Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following -disclaimer in the documentation and/or other materials -provided with the distribution. - -3. The end-user documentation included with the -redistribution, if any, must include the following -acknowledgment: - - "This product includes software developed by the - University of Chicago, as Operator of Argonne National - Laboratory. - -Alternately, this acknowledgment may appear in the software -itself, if and wherever such third-party acknowledgments -normally appear. - -4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" -WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE -UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND -THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE -OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY -OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR -USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF -THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) -DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION -UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL -BE CORRECTED. - -5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT -HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF -ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, -INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF -ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF -PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER -SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT -(INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE, -EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE -POSSIBILITY OF SUCH LOSS OR DAMAGES. - +Minpack Copyright Notice(1999) University of Chicago.All rights reserved + + Redistribution and use in source and binary forms, + with or without modification, + are permitted provided that the following conditions are met : + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation and / + or other materials provided with the distribution. + + 3. The end + - user documentation included with the redistribution, + if any, + must include the following acknowledgment : + + "This product includes software developed by the + University of Chicago, + as Operator of Argonne National Laboratory. + + Alternately, + this acknowledgment may appear in the software itself, + if and wherever such third - party acknowledgments normally appear + . + + 4. WARRANTY DISCLAIMER.THE SOFTWARE IS SUPPLIED + "AS IS" WITHOUT WARRANTY OF ANY KIND.THE COPYRIGHT HOLDER, + THE UNITED STATES, + THE UNITED STATES DEPARTMENT OF ENERGY, + AND THEIR EMPLOYEES : (1)DISCLAIM ANY WARRANTIES, + EXPRESS OR IMPLIED, + INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, + TITLE OR NON - INFRINGEMENT, + (2)DO NOT ASSUME ANY LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, + COMPLETENESS, + OR USEFULNESS OF THE SOFTWARE, + (3)DO NOT REPRESENT THAT USE OF THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, + (4)DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION UNINTERRUPTED, + THAT IT IS ERROR - FREE OR THAT ANY ERRORS WILL BE CORRECTED + . + + 5. LIMITATION OF LIABILITY.IN NO EVENT WILL THE COPYRIGHT HOLDER, + THE UNITED STATES, + THE UNITED STATES DEPARTMENT OF ENERGY, + OR THEIR EMPLOYEES + : BE LIABLE FOR ANY INDIRECT, + INCIDENTAL, + CONSEQUENTIAL, + SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR NATURE, + INCLUDING BUT NOT LIMITED TO LOSS OF PROFITS OR LOSS OF DATA, + FOR ANY REASON WHATSOEVER, + WHETHER SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, + TORT(INCLUDING NEGLIGENCE OR STRICT LIABILITY), + OR OTHERWISE, + EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE POSSIBILITY OF SUCH LOSS OR DAMAGES. -- GitLab From ddc2c1b37852d77241daee96033a2a1566002c3e Mon Sep 17 00:00:00 2001 From: Tobias Wood Date: Mon, 11 Dec 2023 14:09:11 +0000 Subject: [PATCH 02/13] Changed to use git clang-format --- ci/checkformat.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/checkformat.gitlab-ci.yml b/ci/checkformat.gitlab-ci.yml index fc5a7bf3c..1afa5de98 100644 --- a/ci/checkformat.gitlab-ci.yml +++ b/ci/checkformat.gitlab-ci.yml @@ -5,6 +5,6 @@ checkformat:clangformat: - apt-get update -y - apt-get install -y --no-install-recommends clang-format-17 script: - - find Eigen unsupported/Eigen -name "*" ! -name "*.txt" -type f -print0 | xargs -0 -n 1 clang-format-17 --dry-run --Werror --verbose + - git clang-format --dry-run --Werror --verbose only: - merge_requests -- GitLab From 21ce0b6d1eb013056f986cb77c88c665225f03df Mon Sep 17 00:00:00 2001 From: Tobias Wood Date: Mon, 11 Dec 2023 15:23:56 +0000 Subject: [PATCH 03/13] =?UTF-8?q?Runners=20do=20not=20have=20git=20install?= =?UTF-8?q?ed=20by=20default=20=F0=9F=A7=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci/checkformat.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/checkformat.gitlab-ci.yml b/ci/checkformat.gitlab-ci.yml index 1afa5de98..ddb55ff5d 100644 --- a/ci/checkformat.gitlab-ci.yml +++ b/ci/checkformat.gitlab-ci.yml @@ -3,7 +3,7 @@ checkformat:clangformat: image: ubuntu:23.10 before_script: - apt-get update -y - - apt-get install -y --no-install-recommends clang-format-17 + - apt-get install -y --no-install-recommends git clang-format-17 script: - git clang-format --dry-run --Werror --verbose only: -- GitLab From 0dbc757aca05945011a40fd65380953491fed8f4 Mon Sep 17 00:00:00 2001 From: Tobias Wood Date: Mon, 11 Dec 2023 15:25:37 +0000 Subject: [PATCH 04/13] git: 'clang-format' is not a git command --- ci/checkformat.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/checkformat.gitlab-ci.yml b/ci/checkformat.gitlab-ci.yml index ddb55ff5d..b28e411ee 100644 --- a/ci/checkformat.gitlab-ci.yml +++ b/ci/checkformat.gitlab-ci.yml @@ -5,6 +5,6 @@ checkformat:clangformat: - apt-get update -y - apt-get install -y --no-install-recommends git clang-format-17 script: - - git clang-format --dry-run --Werror --verbose + - git clang-format-17 --dry-run --Werror --verbose only: - merge_requests -- GitLab From 868a484022d5109b6e62372059bfdef20595e5b4 Mon Sep 17 00:00:00 2001 From: Tobias Wood Date: Mon, 11 Dec 2023 15:32:01 +0000 Subject: [PATCH 05/13] error: unrecognized arguments: --dry-run --Werror --- ci/checkformat.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/checkformat.gitlab-ci.yml b/ci/checkformat.gitlab-ci.yml index b28e411ee..186c97db3 100644 --- a/ci/checkformat.gitlab-ci.yml +++ b/ci/checkformat.gitlab-ci.yml @@ -5,6 +5,6 @@ checkformat:clangformat: - apt-get update -y - apt-get install -y --no-install-recommends git clang-format-17 script: - - git clang-format-17 --dry-run --Werror --verbose + - git clang-format-17 --diff only: - merge_requests -- GitLab From 8bf8072435e3211c69eddd2ca22685679c116e5c Mon Sep 17 00:00:00 2001 From: Tobias Wood Date: Tue, 12 Dec 2023 22:32:03 +0000 Subject: [PATCH 06/13] Allow failure --- ci/checkformat.gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/checkformat.gitlab-ci.yml b/ci/checkformat.gitlab-ci.yml index 186c97db3..285e112c4 100644 --- a/ci/checkformat.gitlab-ci.yml +++ b/ci/checkformat.gitlab-ci.yml @@ -1,10 +1,11 @@ checkformat:clangformat: stage: checkformat image: ubuntu:23.10 + only: + - merge_requests + allow_failure: true before_script: - apt-get update -y - apt-get install -y --no-install-recommends git clang-format-17 script: - git clang-format-17 --diff - only: - - merge_requests -- GitLab From d25932b9c1a17a25508957ac2bad3249619521c5 Mon Sep 17 00:00:00 2001 From: Tobias Wood Date: Tue, 12 Dec 2023 22:42:24 +0000 Subject: [PATCH 07/13] Revert accidental formatting of CopyrightMINPACK.txt --- .../LevenbergMarquardt/CopyrightMINPACK.txt | 110 +++++++++--------- 1 file changed, 52 insertions(+), 58 deletions(-) diff --git a/unsupported/Eigen/src/LevenbergMarquardt/CopyrightMINPACK.txt b/unsupported/Eigen/src/LevenbergMarquardt/CopyrightMINPACK.txt index 7387a32fd..ae7984dae 100644 --- a/unsupported/Eigen/src/LevenbergMarquardt/CopyrightMINPACK.txt +++ b/unsupported/Eigen/src/LevenbergMarquardt/CopyrightMINPACK.txt @@ -1,58 +1,52 @@ -Minpack Copyright Notice(1999) University of Chicago.All rights reserved - - Redistribution and use in source and binary forms, - with or without modification, - are permitted provided that the following conditions are met : - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation and / - or other materials provided with the distribution. - - 3. The end - - user documentation included with the redistribution, - if any, - must include the following acknowledgment : - - "This product includes software developed by the - University of Chicago, - as Operator of Argonne National Laboratory. - - Alternately, - this acknowledgment may appear in the software itself, - if and wherever such third - party acknowledgments normally appear - . - - 4. WARRANTY DISCLAIMER.THE SOFTWARE IS SUPPLIED - "AS IS" WITHOUT WARRANTY OF ANY KIND.THE COPYRIGHT HOLDER, - THE UNITED STATES, - THE UNITED STATES DEPARTMENT OF ENERGY, - AND THEIR EMPLOYEES : (1)DISCLAIM ANY WARRANTIES, - EXPRESS OR IMPLIED, - INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE, - TITLE OR NON - INFRINGEMENT, - (2)DO NOT ASSUME ANY LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, - COMPLETENESS, - OR USEFULNESS OF THE SOFTWARE, - (3)DO NOT REPRESENT THAT USE OF THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, - (4)DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION UNINTERRUPTED, - THAT IT IS ERROR - FREE OR THAT ANY ERRORS WILL BE CORRECTED - . - - 5. LIMITATION OF LIABILITY.IN NO EVENT WILL THE COPYRIGHT HOLDER, - THE UNITED STATES, - THE UNITED STATES DEPARTMENT OF ENERGY, - OR THEIR EMPLOYEES - : BE LIABLE FOR ANY INDIRECT, - INCIDENTAL, - CONSEQUENTIAL, - SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR NATURE, - INCLUDING BUT NOT LIMITED TO LOSS OF PROFITS OR LOSS OF DATA, - FOR ANY REASON WHATSOEVER, - WHETHER SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, - TORT(INCLUDING NEGLIGENCE OR STRICT LIABILITY), - OR OTHERWISE, - EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE POSSIBILITY OF SUCH LOSS OR DAMAGES. +Minpack Copyright Notice (1999) University of Chicago. All rights reserved + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the +following conditions are met: + +1. Redistributions of source code must retain the above +copyright notice, this list of conditions and the following +disclaimer. + +2. Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following +disclaimer in the documentation and/or other materials +provided with the distribution. + +3. The end-user documentation included with the +redistribution, if any, must include the following +acknowledgment: + + "This product includes software developed by the + University of Chicago, as Operator of Argonne National + Laboratory. + +Alternately, this acknowledgment may appear in the software +itself, if and wherever such third-party acknowledgments +normally appear. + +4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" +WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE +UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND +THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE +OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY +OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR +USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF +THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) +DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION +UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL +BE CORRECTED. + +5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT +HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF +ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, +INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF +ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF +PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER +SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT +(INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE, +EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE +POSSIBILITY OF SUCH LOSS OR DAMAGES. + -- GitLab From f6f4b205534f3561bc95541f08dddf548532ea09 Mon Sep 17 00:00:00 2001 From: Tobias Wood Date: Tue, 12 Dec 2023 22:50:45 +0000 Subject: [PATCH 08/13] Need --commit master --- ci/checkformat.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/checkformat.gitlab-ci.yml b/ci/checkformat.gitlab-ci.yml index 285e112c4..1b1faf46a 100644 --- a/ci/checkformat.gitlab-ci.yml +++ b/ci/checkformat.gitlab-ci.yml @@ -8,4 +8,4 @@ checkformat:clangformat: - apt-get update -y - apt-get install -y --no-install-recommends git clang-format-17 script: - - git clang-format-17 --diff + - git clang-format-17 --diff --commit master -- GitLab From 73798ab452c815a3ed499bba963e63e147546703 Mon Sep 17 00:00:00 2001 From: Tobias Wood Date: Wed, 13 Dec 2023 17:04:34 +0000 Subject: [PATCH 09/13] Git debugging --- ci/checkformat.gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/checkformat.gitlab-ci.yml b/ci/checkformat.gitlab-ci.yml index 1b1faf46a..ec69cf815 100644 --- a/ci/checkformat.gitlab-ci.yml +++ b/ci/checkformat.gitlab-ci.yml @@ -8,4 +8,6 @@ checkformat:clangformat: - apt-get update -y - apt-get install -y --no-install-recommends git clang-format-17 script: + - git branch -v + - git log --graph --decorate --oneline -n 10 - git clang-format-17 --diff --commit master -- GitLab From e76347bd435eae5098696707beabc970ab6d7a2a Mon Sep 17 00:00:00 2001 From: Tobias Wood Date: Wed, 13 Dec 2023 17:27:42 +0000 Subject: [PATCH 10/13] Why git, why? --- ci/checkformat.gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/checkformat.gitlab-ci.yml b/ci/checkformat.gitlab-ci.yml index ec69cf815..89413dbb5 100644 --- a/ci/checkformat.gitlab-ci.yml +++ b/ci/checkformat.gitlab-ci.yml @@ -9,5 +9,6 @@ checkformat:clangformat: - apt-get install -y --no-install-recommends git clang-format-17 script: - git branch -v + - git remote -v - git log --graph --decorate --oneline -n 10 - - git clang-format-17 --diff --commit master + - git clang-format-17 --diff --commit origin/master -- GitLab From 1aa4915755ca9daafe1e21ae37085d7014f0395c Mon Sep 17 00:00:00 2001 From: Tobias Wood Date: Wed, 13 Dec 2023 17:32:17 +0000 Subject: [PATCH 11/13] If this works... --- ci/checkformat.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/checkformat.gitlab-ci.yml b/ci/checkformat.gitlab-ci.yml index 89413dbb5..759ceec70 100644 --- a/ci/checkformat.gitlab-ci.yml +++ b/ci/checkformat.gitlab-ci.yml @@ -11,4 +11,4 @@ checkformat:clangformat: - git branch -v - git remote -v - git log --graph --decorate --oneline -n 10 - - git clang-format-17 --diff --commit origin/master + - git clang-format-17 --diff --commit $(git ls-remote origin | grep refs/heads/master | cut -f1) -- GitLab From 5e3038d72d523cbe32a605c2e9fa0a1d5c477e0e Mon Sep 17 00:00:00 2001 From: Tobias Wood Date: Wed, 13 Dec 2023 17:41:28 +0000 Subject: [PATCH 12/13] If this works, v2... --- ci/checkformat.gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/checkformat.gitlab-ci.yml b/ci/checkformat.gitlab-ci.yml index 759ceec70..9cefa2a68 100644 --- a/ci/checkformat.gitlab-ci.yml +++ b/ci/checkformat.gitlab-ci.yml @@ -10,5 +10,6 @@ checkformat:clangformat: script: - git branch -v - git remote -v + - git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master - git log --graph --decorate --oneline -n 10 - - git clang-format-17 --diff --commit $(git ls-remote origin | grep refs/heads/master | cut -f1) + - git clang-format-17 --diff --commit origin/master -- GitLab From 71f4df79418fb67bcf65a13907bac9d25d2438a7 Mon Sep 17 00:00:00 2001 From: Antonio Sanchez Date: Wed, 13 Dec 2023 11:06:34 -0800 Subject: [PATCH 13/13] Debugging CI --- ci/checkformat.gitlab-ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ci/checkformat.gitlab-ci.yml b/ci/checkformat.gitlab-ci.yml index 9cefa2a68..95aa70f31 100644 --- a/ci/checkformat.gitlab-ci.yml +++ b/ci/checkformat.gitlab-ci.yml @@ -8,8 +8,5 @@ checkformat:clangformat: - apt-get update -y - apt-get install -y --no-install-recommends git clang-format-17 script: - - git branch -v - - git remote -v - - git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master - - git log --graph --decorate --oneline -n 10 - - git clang-format-17 --diff --commit origin/master + - echo git clang-format-17 --diff --commit ${CI_MERGE_REQUEST_DIFF_BASE_SHA} + - git clang-format-17 --diff --commit ${CI_MERGE_REQUEST_DIFF_BASE_SHA} -- GitLab