Compare revisions

Wouter Deconinck · Wouter Deconinck · Wouter Deconinck · Wouter Deconinck · Wouter Deconinck · Wouter Deconinck
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,19 +27,14 @@ variables:

  ## is this nightly or not?
  NIGHTLY:
+  ## Add to tag
+  NIGHTLY_TAG: "nightly"

  ## Additional options for docker build (e.g. --no-cache)
  BUILD_OPTIONS:

-  ## Default version and tags
-  ## - internal tag used for the CI. Also temporarily tagged
-  ##   on eicweb to communicate between jobs (removed in cleanup job)
-  ## - export tag to public registries, optional secondary export tag
-  VERSION: "${CI_COMMIT_REF_NAME}"
-  NIGHTLY_TAG: "nightly"
-  TESTING_TAG: "testing"
-  INTERNAL_TAG: "${TESTING_TAG}-${VERSION}"
-  EXPORT_TAG: ""
+  ## Internal tag used for the CI
+  INTERNAL_TAG: "pipeline-${CI_PIPELINE_ID}"

 stages:
  - config
@@ -98,30 +93,36 @@ workflow:
 ## caching strategy for dispatch to multiple nodes and to avoid
 ##  --> try this strategy: https://medium.com/titansoft-engineering/docker-build-cache-sharing-on-multi-hosts-with-buildkit-and-buildx-eb8f7005918e

+## Default version and tags
+## - internal tag used for the CI. Also temporarily tagged
+##   on eicweb to communicate between jobs (removed in cleanup job)
+## - export tag to public registries, optional secondary export tag
 version:
  stage: config
  script:
    - |
      if [ "x${CI_PIPELINE_SOURCE}" = "xmerge_request_event" ]; then
        VERSION="unstable-mr-${CI_MERGE_REQUEST_PROJECT_ID}-${CI_MERGE_REQUEST_IID}"
-        INTERNAL_TAG="${VERSION}"
        NIGHTLY_TAG="${VERSION}-nightly"
        EXPORT_TAG="${VERSION}"
      elif [[ "$CI_COMMIT_TAG" =~ ^v[0-9.]+\.[0-9]+\.[0-9]+ ]]; then
        VERSION="${CI_COMMIT_TAG:1}"
-        INTERNAL_TAG="stable-tag-${VERSION}"
        EXPORT_TAG="${VERSION}"
-      elif [[ "$CI_COMMIT_BRANCH" = ^v[0-9.]+\.[0-9]+-stable ]]; then
+      elif [[ "$CI_COMMIT_BRANCH" =~ ^v[0-9.]+\.[0-9]+-stable ]]; then
        VERSION="${CI_COMMIT_BRANCH:1}"
-        INTERNAL_TAG="stable-br-${VERSION}"
        EXPORT_TAG="${VERSION}"
      elif [[ "$CI_COMMIT_BRANCH" =~ ^v[0-9.]+\.[0-9]+-[a-z]+-stable ]]; then
        VERSION="${CI_COMMIT_BRANCH:1}"
-        INTERNAL_TAG="stable-br-${VERSION}"
        EXPORT_TAG="${VERSION}"
+      elif [[ "$CI_COMMIT_BRANCH" =~ ^master$ ]]; then
+        VERSION="${CI_COMMIT_BRANCH}"
+        EXPORT_TAG="${VERSION}"
+      else
+        VERSION="${CI_COMMIT_REF_NAME}-${CI_PIPELINE_ID}"
+        EXPORT_TAG=""
      fi
-      echo "VERSION=$VERSION" >> build.env
      echo "INTERNAL_TAG=$INTERNAL_TAG" >> build.env
+      echo "VERSION=$VERSION" >> build.env
      echo "NIGHTLY_TAG=$NIGHTLY_TAG" >> build.env
      echo "EXPORT_TAG=$EXPORT_TAG" >> build.env
      cat build.env

--- a/containers/debian/base.Dockerfile
+++ b/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                                                       \

--- a/containers/dind/Dockerfile
+++ b/containers/dind/Dockerfile
@@ -54,8 +54,7 @@ ADD https://get.docker.com/ /tmp/get-docker.sh
 RUN bash /tmp/get-docker.sh --version ${DOCKER_VERSION}

 # Install the magic wrapper.
-ADD ./wrapdocker /usr/local/bin/wrapdocker
-RUN chmod +x /usr/local/bin/wrapdocker
+ADD --chmod=0755 wrapdocker /usr/local/bin/wrapdocker

 # Define additional metadata for our image.
 VOLUME /var/lib/docker

--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -193,14 +193,13 @@ COPY profile.d/z11_jug_env.sh /etc/profile.d
 COPY singularity.d /.singularity.d

 ## Add minio client into /usr/local/bin
-ADD https://dl.min.io/client/mc/release/linux-amd64/mc /usr/local/bin/mc-amd64
-ADD https://dl.min.io/client/mc/release/linux-arm64/mc /usr/local/bin/mc-arm64
+ADD --chmod=0755 https://dl.min.io/client/mc/release/linux-amd64/mc /usr/local/bin/mc-amd64
+ADD --chmod=0755 https://dl.min.io/client/mc/release/linux-arm64/mc /usr/local/bin/mc-arm64
 RUN declare -A target=(                                                 \
      ["linux/amd64"]="amd64"                                           \
      ["linux/arm64"]="arm64"                                           \
    )                                                                   \
 && mv /usr/local/bin/mc-${target[${TARGETPLATFORM}]} /usr/local/bin/mc \
- && chmod a+x /usr/local/bin/mc                                         \
 && unset target[${TARGETPLATFORM}]                                     \
 && for t in ${target[*]} ; do                                          \
      rm /usr/local/bin/mc-${t} ;                                       \

--- a/containers/jug/eic-news
+++ b/containers/jug/eic-news
+#!/bin/bash
+
+news=$HOME/.eic-news
+
+# run only if stdin and sterr
+if [[ -t 0 && -t 2 && ! -f $HOME/.hushlogin && -f $news ]] ; then
+
+  if [[ $- == *i* ]] ; then
+    # sourced: print once a day
+    if [[ -z $(find $HOME/.eic-news -atime -1) ]] ; then
+      cat $news
+    fi
+  else
+    # else: print always
+    cat $news
+  fi
+
+  # update once a day
+  if [[ -z $(find $HOME/.eic-news -mtime -1) ]] ; then
+    (&>/dev/null curl --silent --connect-timeout 5 --location https://eic.github.io/motd --output $news &)
+  fi
+fi
--- a/containers/jug/setup_detectors.py
+++ b/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 = [

--- a/containers/jug/xl.Dockerfile
+++ b/containers/jug/xl.Dockerfile
@@ -140,5 +140,10 @@ RUN --mount=type=cache,target=/ccache/,sharing=locked,id=${TARGETPLATFORM}
 && ccache --show-stats                                                         \
 && rm /tmp/setup_detectors.py

+## eic-news
+COPY --chmod=0755 eic-news /usr/local/bin/eic-news
+RUN echo "test -f $HOME/.eic-news && source /usr/local/bin/eic-news"            \
+    > /etc/profile.d/z13_eic-news.sh 
+
 ## Hotfix for misbehaving OSG nodes
 RUN mkdir /hadoop
--- a/detectors.yaml
+++ b/detectors.yaml
@@ -3,45 +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
    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
-      cxxflags: -DDD4HEP_FIELD_TYPE_OVERRIDE=field_type
+    23.07.1:
+      version: 23.07.1
--- a/eic-spack.sh
+++ b/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.6"
+EICSPACK_VERSION="v0.20.7"

 ## Space-separated list of eic-spack cherry-picks
 read -r -d '' EICSPACK_CHERRYPICKS <<- \

--- a/spack.sh
+++ b/spack.sh
@@ -3,7 +3,7 @@ SPACK_ORGREPO="spack/spack"

 ## Spack github version, e.g. v0.18.1 or commit hash
 ## note: nightly builds will use e.g. releases/v0.19
-SPACK_VERSION="v0.20.0"
+SPACK_VERSION="v0.20.1"

 ## Space-separated list of spack cherry-picks
 read -r -d '' SPACK_CHERRYPICKS <<- \
No results found