ensure usage of bundled fmt lib

KIT-CMS · Jul 23, 2024 · 2b0ba40 · 2b0ba40
1 parent 42be0e5
commit 2b0ba40
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -31,6 +31,13 @@ jobs:
     outputs:
       tag: ${{ steps.check-tag.outputs.tag }}
     steps:
+      - name: Clone project
+        uses: actions/checkout@v3
+        with:
+          ssh-key: ${{ secrets.CERN_GITLAB_PRIVATE_KEY }}
+          submodules: "recursive"
+          ssh-strict: "false"
+          ssh-known-hosts: "[gitlab.cern.ch]:7999 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubVS0czgKaPkC5cfB75CI3XjgWBv7pj2ILiZezVf8okkCAYr+bf4w6VrH2pyv3NRUW5Mm8U/3zoSNcrYIqhFFpz6R62/3xt8hMrPKJKstbt1lSIr8QhEyD24SJEKugMi560BWRPkTzXrrFgxz0X4vuKKytpvihRsccZ7F1JaX76UCWEJ3Xr2BFCEnnN6gj9nvFr4gvSMneunWVLGw2KcHwS1OJfnWBlp3fB0rYWSxZAoVjcjZjvv3hioEftaTapff2PkdQIX//N9Cc555FzdmMzixTvU5j/i+QvjxWVbEBNSKI6te6udC4fYUZMePs2QQnqw9mXUQtaQtw+HV7utuw=="
       - name: Check if PR-specific tag exists
         id: check-tag
         run: |

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -3,7 +3,7 @@ FROM rootproject/root:6.30.04-ubuntu22.04
 
 # Install necessary packages
 RUN apt-get update -y
-RUN apt-get install -y ca-certificates gpg wget git make python3-pip libfmt-dev  openmpi-bin libopenmpi-dev libboost-all-dev openssh-client nlohmann-json3-dev
+RUN apt-get install -y ca-certificates gpg wget git make python3-pip openmpi-bin libopenmpi-dev libboost-all-dev openssh-client nlohmann-json3-dev
 
 RUN python3 -m pip install GitPython && python3 -m pip install git+https://github.com/cms-nanoAOD/correctionlib.git
 

diff --git a/include/utility/Logger.hxx b/include/utility/Logger.hxx
@@ -5,7 +5,7 @@
 #include <Math/Vector4D.h>
 #include <TObjString.h>
 #include <bitset>
-#include <fmt/core.h> // Include fmt library header
+#include <spdlog/fmt/bundled/core.h> // Include fmt library header
 #include <map>
 #include <mutex>
 #include <spdlog/sinks/basic_file_sink.h>

diff --git a/init.sh b/init.sh
@@ -28,7 +28,7 @@ if [[ "$distro" == "CentOS" ]]; then
         # source /cvmfs/sft-nightlies.cern.ch/lcg/views/dev3/latest/x86_64-centos7-clang12-opt/setup.sh
         # source /cvmfs/sft-nightlies.cern.ch/lcg/views/dev3/latest/x86_64-centos7-gcc11-dbg/setup.sh
         echo "CentOS 7 is EOL, running on LCG 105, support will be dropped soon"
-        source /cvmfs/sft.cern.ch/lcg/views/LCG_105/x86_64-centos7-gcc13-opt/setup.sh
+        source /cvmfs/sft.cern.ch/lcg/views/LCG_105/x86_64-centos7-gcc11-opt/setup.sh
     else
         echo "Unsupported CentOS version, exiting..."
         return 0