Skip to content
Snippets Groups Projects

Hard-code JDK17 path for now

Merged Reiner Hauser requested to merge jdk17path into tdaq-99-01-10
1 file
+ 2
2
Compare changes
  • Side-by-side
  • Inline
+ 2
2
@@ -343,7 +343,6 @@ dev/x86_64-el9-gcc13-opt:
CCACHE_OPTION: "-D USE_CCACHE=TRUE"
TDAQ_VERSION: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
TDAQ_COMMON_VERSION: "tdaq-common-99-00-00"
CMAKE_LOCAL_OPTIONS: "-D JAVA_HOME=/cvmfs/sft.cern.ch/lcg/releases/java/17.0.8p1-b5995/x86_64-centos7-gcc11-opt -D TDAQ_JAVA_HOME=/cvmfs/sft.cern.ch/lcg/releases/java/17.0.8p1-b5995/x86_64-centos7-gcc11-opt/"
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^tdaq-99-01-.*$/
artifacts:
@@ -355,7 +354,8 @@ dev/x86_64-el9-gcc13-opt:
allow_failure: true
before_script:
- version=$(echo ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME##tdaq-} | sed 's;-0*;.;g')
- export CMAKE_LOCAL_OPTIONS="-D TDAQ_COMMON_VERSION=${version} -D TDAQ_VERSION=${version}"
- export CMAKE_LOCAL_OPTIONS="-D TDAQ_COMMON_VERSION=${version} -D TDAQ_VERSION=${version} -D JAVA_HOME=/cvmfs/sft.cern.ch/lcg/releases/java/17.0.8p1-b5995/x86_64-centos7-gcc11-opt -D TDAQ_JAVA_HOME=/cvmfs/sft.cern.ch/lcg/releases/java/17.0.8p1-b5995/x86_64-centos7-gcc11-opt"
after_script:
- echo -n "$SSH_KEY" > id_ci
- chmod og-rwx id_ci
Loading