Commit df26016f authored by Paul Schütze's avatar Paul Schütze
Browse files

Merge branch 'lcg_update' into 'master' 

Update LCG version of CI to LCG_101

See merge request allpix-squared/allpix-squared!552
parents b45acaeb 25af5597

.ci/init_x86_64.sh

+7 −5
Original line number Diff line number Diff line
@@ -15,7 +15,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" ] || [ "${MACOS_MAJOR}.${MACOS_MINOR}" = "10.15" ]; then

    if [ $MACOS_MAJOR = "11" ]; then

        OS=mac11

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

        OS=mac1015

    else

        echo "Unsupported version of macOS ${MACOS_MAJOR}.${MACOS_MINOR}"
@@ -28,7 +30,7 @@ fi 


# Determine is you have CVMFS installed

CVMFS_MOUNT=""

if [ "$OS" = mac1015 ]; then

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

    CVMFS_MOUNT="/Users/Shared"

fi
@@ -48,7 +50,7 @@ fi 




# Determine which LCG version to use

DEFAULT_LCG="LCG_99"

DEFAULT_LCG="LCG_101"



if [ -z ${ALLPIX_LCG_VERSION} ]; then

    echo "No explicit LCG version set, using ${DEFAULT_LCG}."
@@ -66,14 +68,14 @@ if [ -z ${COMPILER_TYPE} ]; then 
    fi

fi

if [ ${COMPILER_TYPE} = "gcc" ]; then

    COMPILER_VERSION="gcc10"

    COMPILER_VERSION="gcc11"

    echo "Compiler type set to GCC, version ${COMPILER_VERSION}."

fi

if [ ${COMPILER_TYPE} = "llvm" ]; then

    if [ "$(uname)" = "Darwin" ]; then

        COMPILER_VERSION="clang120"

    else

        COMPILER_VERSION="clang10"

        COMPILER_VERSION="clang12"

    fi

    echo "Compiler type set to LLVM, version ${COMPILER_VERSION}."

fi

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

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

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

env:

  LCG_VERSION: LCG_99

  LCG_VERSION: LCG_101

jobs:

  compile-centos7:

    strategy:

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

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

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

env:

  LCG_VERSION: LCG_99

  LCG_VERSION: LCG_101

jobs:



  format:

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -279,9 +279,9 @@ ADD_RUNTIME_DEP(thisroot.sh) 
###################################



# Set the clang-format version required by the CI for correct formatting:

SET(CLANG_FORMAT_VERSION "10")

SET(CLANG_FORMAT_VERSION "12")

# Set the clang-tidy version of the linter required by the CI:

SET(CLANG_TIDY_VERSION "10")

SET(CLANG_TIDY_VERSION "12")



# Set the source files to clang-format (FIXME: determine this better)

FILE(

src/core/module/ThreadPool.hpp

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ namespace allpix { 
            /**

             * @brief Erases the queue and release waiting threads on destruction

             */

            ~SafeQueue();

            ~SafeQueue() { invalidate(); };



            /**

             * @brief Get the top value from the appropriate queue