From 502231860f1a5738b504d359613b52b8d5c06eda Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Wed, 6 Sep 2023 16:52:56 +0200
Subject: [PATCH] Do not use git from CVMFS for check-sources
---
.gitlab-ci.yml | 2 --
ci-utils/check-sources | 7 ++-----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e4d4c0d6cd..361dd3b79d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -221,8 +221,6 @@ warnings-check:lcg-view:102b:x86_64-centos7-gcc11-opt:
### Misc checks
lcg:103:x86_64-centos7-gcc12-opt:check-unused:
image: gitlab-registry.cern.ch/lhcb-docker/os-base/alma9-devel:latest
- tags:
- - cvmfs
needs:
- job: "lcg:103:x86_64-centos7-gcc12-opt"
artifacts: true
diff --git a/ci-utils/check-sources b/ci-utils/check-sources
index 4a42b2b9f0..d359302cc8 100755
--- a/ci-utils/check-sources
+++ b/ci-utils/check-sources
@@ -1,6 +1,6 @@
#!/bin/bash
#####################################################################################
-# (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations #
+# (c) Copyright 1998-2023 CERN for the benefit of the LHCb and ATLAS collaborations #
# #
# This software is distributed under the terms of the Apache version 2 licence, #
# copied verbatim in the file "LICENSE". #
@@ -14,15 +14,12 @@ set -eo pipefail
build_file="$1"
IFS=$'\n'
-# FIXME remove this once the system git is not as old...
-git=/cvmfs/lhcb.cern.ch/lib/contrib/git/2.14.2/bin/git
-
# Find sources not explicitly referenced from CMakeLists.txt files
not_in_cmakelists=()
for package in $($git ls-files -- '*/CMakeLists.txt' ':!:cmake/'); do
dir=$(dirname $package)
pushd "$dir" >/dev/null
- missing=$($git ls-files --cached --others '*.cpp' ':!:*/contrib/*' | \
+ missing=$(git ls-files --cached --others '*.cpp' ':!:*/contrib/*' | \
xargs -n1 -I_path bash -c \
"git grep -q '_path' -- CMakeLists.txt || echo $dir/_path")
if [ -n "$missing" ]; then
--
GitLab