From c4e3049551f5e00b21a0ed4e05ae67f2845941ce Mon Sep 17 00:00:00 2001 From: Miroslav Saur Date: Thu, 5 Jun 2025 13:49:34 +0000 Subject: [PATCH] Merge branch 'pre-commit-copyright' into 'master' Move pre-commit check for copyright notice See merge request lhcb/MooreOnline!629 (cherry picked from commit 7fc6f16ea1df9442aef07d91b3df7088ca65edff) 37de5638 Move pre-commit check for copyright notice Co-authored-by: Chris Burr --- .gitlab-ci.yml | 6 ------ .pre-commit-config.yaml | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1077135c..0b4242922 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,12 +11,6 @@ variables: TARGET_BRANCH: master -check-copyright: - image: gitlab-registry.cern.ch/ci-tools/ci-worker:cc7 - script: - - curl -o lb-check-copyright "https://gitlab.cern.ch/lhcb-core/LbDevTools/raw/master/LbDevTools/SourceTools.py?inline=false" - - python lb-check-copyright origin/${TARGET_BRANCH} --exclude lhcbproject.yml - check-formatting: tags: - cvmfs diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 37a9afe5d..3bae8a689 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,3 +8,8 @@ repos: types_or: [python, yaml] exclude: ".pre-commit-config.yaml" entry: 'eoslhcb.cern.ch//eos/lhcb/' +- repo: "https://gitlab.cern.ch/lhcb-core/LbDevTools.git" + rev: 2.1.4 + hooks: + - id: lb-add-copyright + exclude: "^lhcbproject.yml$" -- GitLab