Merge branch 'lcg_103' into 'master' (138edb0c) · Commits · XRFLab109 / Allpix Squared

.ci/init_x86_64.sh

+2 −2

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


		# Determine which LCG version to use
		DEFAULT_LCG="LCG_102"
		DEFAULT_LCG="LCG_103"

		if [ -z ${ALLPIX_LCG_VERSION} ]; then
		echo "No explicit LCG version set, using ${DEFAULT_LCG}."
		@@ -76,7 +76,7 @@ if [ -z ${COMPILER_TYPE} ]; then
		fi
		fi
		if [ ${COMPILER_TYPE} = "gcc" ]; then
		COMPILER_VERSION="gcc11"
		COMPILER_VERSION="gcc12"
		echo "Compiler type set to GCC, version ${COMPILER_VERSION}."
		fi
		if [ ${COMPILER_TYPE} = "llvm" ]; then

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -6,12 +6,12 @@ on:
		pull_request:
		types: [opened, reopened, edited, ready_for_review, synchronize]
		env:
		LCG_VERSION: LCG_102
		LCG_VERSION: LCG_103
		jobs:
		compile-centos7:
		strategy:
		matrix:
		compiler: [gcc11, clang12]
		compiler: [gcc12, clang12]
		runs-on: ubuntu-latest
		steps:
		- uses: actions/checkout@v2
		@@ -42,7 +42,7 @@ jobs:
		strategy:
		matrix:
		whichtest: [test_core, test_modules, examples]
		compiler: [gcc11, clang12]
		compiler: [gcc12, clang12]
		steps:
		- uses: actions/checkout@v2
		with:
		@@ -72,7 +72,7 @@ jobs:
		- uses: aidasoft/run-lcg-view@v2
		with:
		run_local_checkout: 'false'
		release-platform: "${{env.LCG_VERSION}}/x86_64-mac1015-clang120-opt"
		release-platform: "${{env.LCG_VERSION}}/x86_64-mac11-clang120-opt"
		run: \|
		mkdir build
		cd build
		@@ -106,7 +106,7 @@ jobs:
		- uses: aidasoft/run-lcg-view@v2
		with:
		run_local_checkout: 'false'
		release-platform: "${{env.LCG_VERSION}}/x86_64-mac1015-clang120-opt"
		release-platform: "${{env.LCG_VERSION}}/x86_64-mac11-clang120-opt"
		run: \|
		chmod -R a+x .github
		source .ci/init_x86_64.sh

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

+4 −4

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_102
		LCG_VERSION: LCG_103
		jobs:

		format:
		@@ -19,7 +19,7 @@ jobs:
		- uses: aidasoft/run-lcg-view@v2
		with:
		run_local_checkout: 'false'
		release-platform: "${{env.LCG_VERSION}}/x86_64-centos7-clang10-opt"
		release-platform: "${{env.LCG_VERSION}}/x86_64-centos7-clang12-opt"
		run: \|
		mkdir build
		cd build
		@@ -36,7 +36,7 @@ jobs:
		- uses: aidasoft/run-lcg-view@v2
		with:
		run_local_checkout: 'false'
		release-platform: "${{env.LCG_VERSION}}/x86_64-centos7-clang10-opt"
		release-platform: "${{env.LCG_VERSION}}/x86_64-centos7-clang12-opt"
		run: \|
		mkdir build
		cd build
		@@ -53,7 +53,7 @@ jobs:
		- uses: aidasoft/run-lcg-view@v2
		with:
		run_local_checkout: 'false'
		release-platform: "${{env.LCG_VERSION}}/x86_64-centos7-clang10-opt"
		release-platform: "${{env.LCG_VERSION}}/x86_64-centos7-clang12-opt"
		run: \|
		mkdir build
		cd build

.gitlab-ci.yml

+16 −16

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:v3"
		DOCKER_DEPS_IMAGE: "gitlab-registry.cern.ch/allpix-squared/allpix-squared/allpix-squared-deps:v4"
		EOS_PATH: "/eos/project/a/allpix-squared/www/"
		DOCKER_FILE: etc/docker/Dockerfile

		@@ -38,8 +38,8 @@ stages:
		- source .ci/init_x86_64.sh
		- mkdir -p build/ && cd build/

		.centos8:
		image: gitlab-registry.cern.ch/sft/docker/centos8:latest
		.centos9:
		image: gitlab-registry.cern.ch/sft/docker/centos9:latest
		tags:
		- docker
		variables:
		@@ -129,9 +129,9 @@ cmp:cc7-llvm:
		variables:
		COMPILER_TYPE: "llvm"

		cmp:cc8-gcc:
		cmp:cc9-gcc:
		extends:
		- .centos8
		- .centos9
		- .compile

		cmp:macos-clang:
		@@ -193,6 +193,7 @@ fmt:coverage:
		COMPILER_TYPE: "gcc"
		script:
		- export PATH=$PATH:~/.local/bin
		- export PYTHONPATH=~/.local/lib/python3.9/site-packages:$PYTHONPATH
		- pip install --trusted-host=pypi.org --user gcovr==5.0
		- export CCACHE_DIR=`pwd`/ccache
		- cmake -GNinja -DCMAKE_CXX_FLAGS="-Werror" -DBUILD_ALL_MODULES=ON -DCMAKE_BUILD_TYPE=Debug -DCOVERAGE=ON ..
		@@ -358,20 +359,20 @@ core:cc7-llvm:
		artifacts: true

		# CentOS 8
		mod:cc8-gcc:
		mod:cc9-gcc:
		extends:
		- .centos8
		- .centos9
		- .testmod
		needs:
		- job: cmp:cc8-gcc
		- job: cmp:cc9-gcc
		artifacts: true

		core:cc8-gcc:
		core:cc9-gcc:
		extends:
		- .centos8
		- .centos9
		- .testcore
		needs:
		- job: cmp:cc8-gcc
		- job: cmp:cc9-gcc
		artifacts: true

		# Mac OS
		@@ -461,7 +462,6 @@ docs:doxygen:
		extends: .doc
		image: $DOCKER_DEPS_IMAGE
		script:
		- apt install -y unzip doxygen
		- curl -sL https://github.com/matusnovak/doxybook2/releases/download/v1.5.0/doxybook2-linux-amd64-v1.5.0.zip --output /tmp/doxybook2-linux64.zip
		- unzip /tmp/doxybook2-linux64.zip -d /usr/local/
		- cmake -DBUILD_DOCS_ONLY=ON ..
		@@ -531,12 +531,12 @@ pkg:cc7-llvm:
		variables:
		COMPILER_TYPE: "llvm"

		pkg:cc8-gcc:
		pkg:cc9-gcc:
		extends:
		- .centos8
		- .centos9
		- .pack
		needs:
		- job: cmp:cc8-gcc
		- job: cmp:cc9-gcc
		artifacts: true

		pkg:macos-clang:
		@@ -590,7 +590,7 @@ deploy:cvmfs:
		dependencies:
		- pkg:cc7-gcc
		- pkg:cc7-llvm
		- pkg:cc8-gcc
		- pkg:cc9-gcc
		- pkg:macos-clang
		tags:
		- cvmfs-deploy

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.0 / LCG102.
		test suite. All tests in the repository are written for Geant4 11.1 / LCG103.
		{{% /alert %}}

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