Commit 999bce47 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Switch to LCG_102

(cherry picked from commit cccb892b)
parent 0e68aeba
Loading
Loading
Loading
Loading
+5 −3
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" ]; 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
@@ -30,7 +32,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

@@ -50,7 +52,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}."
+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_101
  LCG_VERSION: LCG_102
jobs:
  compile-centos7:
    strategy:
+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_101
  LCG_VERSION: LCG_102
jobs:

  format: