diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 395f4809ac5cacd349c54807300ffd09065033a4..a5d7c37b8a2a534afbe8f9d7fdac37fa0d1c8031 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,7 +21,7 @@ jobs: runs-on: self-hosted strategy: matrix: - LCG_RELEASE: [LCG_101, KEY4HEP_STACK] + LCG_RELEASE: [LCG_EXTERNAL, KEY4HEP_STACK] # CEPCSW_BLDTOOL: [make, ninja] CEPCSW_BLDTOOL: [ninja] diff --git a/build.sh b/build.sh index 14c0ab21509ab61ea48b4715c25ea93efe5018c6..c584e4a7ded51759bc6c900702537d21d5cf48fe 100755 --- a/build.sh +++ b/build.sh @@ -83,7 +83,8 @@ function run-cmake() { } function run-make() { - cmake --build . + local njobs=-j$(nproc) + cmake --build . $njobs } function run-install() { @@ -95,8 +96,8 @@ function run-install() { ############################################################################## # The current default platform -lcg_platform=x86_64-centos7-gcc8-opt -lcg_version=101.0.1 +lcg_platform=x86_64-centos7-gcc11-opt +lcg_version=103.0.0 bldtool=${CEPCSW_BLDTOOL} # make, ninja # set in env var diff --git a/run.sh b/run.sh index bb42b5c8d3b22959ff6e0ffa15306f6fdad1fa19..95f14814ac1eb83f43c77d187f621974576bd904 100755 --- a/run.sh +++ b/run.sh @@ -66,8 +66,8 @@ function run-job() { ############################################################################## # The current default platform -lcg_platform=x86_64-centos7-gcc8-opt -lcg_version=101.0.1 +lcg_platform=x86_64-centos7-gcc11-opt +lcg_version=103.0.0 bldtool=${CEPCSW_BLDTOOL} # make, ninja # set in env var diff --git a/setup.sh b/setup.sh index 2f285d787a7087dcaace21117037477796846070..7e678023cf9c362148fe13ad70ae39f157f368b8 100644 --- a/setup.sh +++ b/setup.sh @@ -70,7 +70,7 @@ function setup-install-area() { # CEPCSW_LCG_VERSION=${1}; shift if [ -z "$CEPCSW_LCG_VERSION" ]; then - CEPCSW_LCG_VERSION=101.0.1 + CEPCSW_LCG_VERSION=103.0.0 fi export CEPCSW_LCG_VERSION