Commit ded2b0a1 authored by Håkan Wennlöf's avatar Håkan Wennlöf
Browse files

Merge branch 'p-lcg105' into 'master' 

Update Dependencies to LCG105

See merge request allpix-squared/allpix-squared!1103
parents bb986185 f2f2dc5d

.ci/init_x86_64.sh

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ fi 




# Determine which LCG version to use

DEFAULT_LCG="LCG_104"

DEFAULT_LCG="LCG_105"



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_104

  LCG_VERSION: LCG_105

jobs:

  compile-alma9:

    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_104

  LCG_VERSION: LCG_105

jobs:



  format:

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +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:v5"

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

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

    DOCKER_FILE: etc/docker/Dockerfile

doc/usermanual/12_testing/_index.md

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ of the framework and its modules. 


{{% alert title="Note" color="info" %}}

Since different Geant4 versions may result in different events, a specific Geant4 version needs to be chosen for the

test suite. All tests in the repository are written for Geant4 11.1 / LCG103.

test suite. All tests in the repository are written for Geant4 11.2 / LCG105.

{{% /alert %}}



The tests can also be manually invoked from the build directory of Allpix Squared with: