From 0e8f8ed74580d685dcc3908481fdbfee573df3b6 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Tue, 18 Apr 2023 08:23:19 +0800
Subject: [PATCH] WIP: switch from 101.0.1 to 103.0.0
---
.github/workflows/main.yml | 2 +-
build.sh | 7 ++++---
run.sh | 4 ++--
setup.sh | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 395f4809..a5d7c37b 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 14c0ab21..c584e4a7 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 bb42b5c8..95f14814 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 2f285d78..7e678023 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
--
GitLab