.gitlab-ci.yml

@@ -4,7 +4,7 @@ variables:
   ## Application versions used for the main release 
   ## note: nightly builds will always use the master/main branch
   JUGGLER_VERSION: "v9.4.0"
-  EICRECON_VERSION: "v1.2.1"
+  EICRECON_VERSION: "v1.3.1"
 
   ## Local registry
   CI_PUSH: 1

containers/debian/base.Dockerfile

@@ -80,6 +80,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked             \
           gcc${GCC} g++${GCC} gfortran${GCC}                            \
    && apt-get -yqq install                                              \
           clang${CLANG} clang-tidy${CLANG} clang-format${CLANG}         \
+          iwyu                                                          \
    && update-alternatives --install /usr/bin/gcc gcc                    \
                                     /usr/bin/gcc${GCC} 100              \
    && update-alternatives --install /usr/bin/g++ g++                    \
@@ -95,6 +96,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked             \
    && apt-get -yqq install                                              \
           gcc g++ gfortran                                              \
           clang clang-tidy clang-format                                 \
+          iwyu                                                          \
  ; fi                                                                   \
  && apt-get -yqq autoremove                                             \
  && gcc --version                                                       \

containers/jug/setup_detectors.py

@@ -105,6 +105,8 @@ if __name__ == '__main__':
                     subprocess.check_call(' '.join(cmd), shell=True)
             ## build
             cxxflags = ''
+            if os.environ['CXXFLAGS']:
+                cxxflags = os.environ['CXXFLAGS']
             if cfg.get('cxxflags'):
                 cxxflags = cfg['cxxflags']
             cmd = [

detectors.yaml

@@ -3,47 +3,37 @@ detectors:
     nightly:
       default: true
       version: main
-      cxxflags: -DDD4HEP_FIELD_TYPE_OVERRIDE=field_type
     main:
       version: main
-      cxxflags: -DDD4HEP_FIELD_TYPE_OVERRIDE=field_type
-    22.12.0:
-      version: 22.12.0
-      patches:
-      - https://github.com/eic/epic/pull/449.patch
-      cxxflags: -DDD4HEP_FIELD_TYPE_OVERRIDE=field_type
     23.01.0:
       version: 23.01.0
       patches:
       - https://github.com/eic/epic/pull/449.patch
-      cxxflags: -DDD4HEP_FIELD_TYPE_OVERRIDE=field_type
     23.03.0:
       version: 23.03.0
       patches:
       - https://github.com/eic/epic/pull/449.patch
-      cxxflags: -DDD4HEP_FIELD_TYPE_OVERRIDE=field_type
     23.05.0:
       version: 23.05.0
       patches:
       - https://github.com/eic/epic/pull/449.patch
-      cxxflags: -DDD4HEP_FIELD_TYPE_OVERRIDE=field_type
     23.05.1:
       version: 23.05.1
       patches:
       - https://github.com/eic/epic/pull/449.patch
-      cxxflags: -DDD4HEP_FIELD_TYPE_OVERRIDE=field_type
     23.05.2:
       version: 23.05.2
       patches:
       - https://github.com/eic/epic/pull/449.patch
-      cxxflags: -DDD4HEP_FIELD_TYPE_OVERRIDE=field_type
     23.06.0:
       version: 23.06.0
       patches:
       - https://github.com/eic/epic/pull/449.patch
-      cxxflags: -DDD4HEP_FIELD_TYPE_OVERRIDE=field_type
     23.06.1:
       version: 23.06.1
       patches:
       - https://github.com/eic/epic/pull/449.patch
-      cxxflags: -DDD4HEP_FIELD_TYPE_OVERRIDE=field_type
+    23.07.0:
+      version: 23.07.0
+    23.07.1:
+      version: 23.07.1

eic-spack.sh

@@ -3,7 +3,7 @@ EICSPACK_ORGREPO="eic/eic-spack"
 
 ## EIC spack github version, e.g. v0.19.7 or commit hash
 ## note: nightly builds will use e.g. releases/v0.19
-EICSPACK_VERSION="v0.20.4"
+EICSPACK_VERSION="v0.20.7"
 
 ## Space-separated list of eic-spack cherry-picks
 read -r -d '' EICSPACK_CHERRYPICKS <<- \