Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tdaq-cmake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
atlas-tdaq-software
tdaq-cmake
Merge requests
!865
Hard-code JDK17 path for now
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Hard-code JDK17 path for now
jdk17path
into
tdaq-99-01-10
Overview
0
Commits
2
Pipelines
2
Changes
1
Merged
Reiner Hauser
requested to merge
jdk17path
into
tdaq-99-01-10
1 year ago
Overview
0
Commits
2
Pipelines
2
Changes
1
Expand
Hack in .gitlab-ci.yaml to hardcode the JDK path for Java 17
0
0
Merge request reports
Viewing commit
f3c2c5e7
Prev
Next
Show latest version
1 file
+
2
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
f3c2c5e7
Avoid overriding local cmake options for Java
· f3c2c5e7
Reiner Hauser
authored
1 year ago
.gitlab-ci.yml
+
2
−
2
Options
@@ -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