Commit ad481187 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'lcg102' into 'master' 

Update CI to LCG102

See merge request allpix-squared/allpix-squared!826
parents 86fe21ad 63fa1eb9

.ci/init_x86_64.sh

+5 −3
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ if [ "$(uname)" = "Linux" ]; then 
elif [ "$(uname)" = "Darwin" ]; then

    MACOS_MAJOR=$(sw_vers -productVersion | awk -F '.' '{print $1}')

    MACOS_MINOR=$(sw_vers -productVersion | awk -F '.' '{print $2}')

    if [ $MACOS_MAJOR = "11" ]; then

    if [ $MACOS_MAJOR = "12" ]; then

        OS=mac12

    elif [ $MACOS_MAJOR = "11" ]; then

        OS=mac11

    elif [ "${MACOS_MAJOR}.${MACOS_MINOR}" = "10.15" ]; then

        OS=mac1015
@@ -33,7 +35,7 @@ fi 


# Determine is you have CVMFS installed

CVMFS_MOUNT=""

if [ "$OS" = mac1015 ] || [ "$OS" = mac11 ] ; then

if [ "$OS" = mac1015 ] || [ "$OS" = mac11 ] || [ "$OS" = mac12] ; then

    CVMFS_MOUNT="/Users/Shared"

fi
@@ -53,7 +55,7 @@ fi 




# Determine which LCG version to use

DEFAULT_LCG="LCG_101"

DEFAULT_LCG="LCG_102"



if [ -z ${ALLPIX_LCG_VERSION} ]; then

    echo "No explicit LCG version set, using ${DEFAULT_LCG}."

.github/workflows/compilation-and-test.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ on: 
  pull_request:

    types: [opened, reopened, edited, ready_for_review, synchronize]

env:

  LCG_VERSION: LCG_101

  LCG_VERSION: LCG_102

jobs:

  compile-centos7:

    strategy:

.github/workflows/format-and-lint.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ on: 
  pull_request:

    types: [opened, reopened, edited, ready_for_review, synchronize]

env:

  LCG_VERSION: LCG_101

  LCG_VERSION: LCG_102

jobs:



  format:

.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


variables:

    REPOSITORY: "https://gitlab.cern.ch/allpix-squared/allpix-squared.git"

    DOCKER_DEPS_IMAGE: "gitlab-registry.cern.ch/allpix-squared/allpix-squared/allpix-squared-deps:v2"

    EOS_PATH: "/eos/project/a/allpix-squared/www/"

    DOCKER_FILE: etc/docker/Dockerfile
@@ -41,7 +42,7 @@ stages: 
        - mkdir -p build/ && cd build/



.docker:

    image: gitlab-registry.cern.ch/allpix-squared/allpix-squared/allpix-squared-deps:latest

    image: $DOCKER_DEPS_IMAGE

    tags:

        - docker

    before_script:

doc/usermanual/02_installation/02_prerequisites.md

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ For some modules, additional dependencies exist. For details about the dependenc 
  -DGEANT4_USE_OPENGL_X11=ON

  -DGEANT4_BUILD_CXXSTD=17

  -DGEANT4_BUILD_MULTITHREADED=ON

  -DGEANT4_BUILD_BUILTIN_BACKTRACE=OFF

  ```



- Eigen3 \[[@eigen3]\]: