Skip to content
Snippets Groups Projects
Commit ee2726f5 authored by Administrator's avatar Administrator Committed by Volker Friese
Browse files

Cleanup CI 

Remove builds which use old and unsupported FairSoft and FairRoot versions.
Update FairSoft and FairRoot versions for real data test.
Add missing dependency for clang-format checks.
parent a0d573f6
No related branches found
No related tags found
1 merge request!800Revise the build environment (Move to C++17)
Pipeline #17093 passed
Stage: build
    Hide whitespace changes
    Inline Side-by-side
    .gitlab-ci.yml
    + 42
    − 43
    View file @ ee2726f5
    ...@@ -83,17 +83,16 @@ CodeFormatCheck: ...@@ -83,17 +83,16 @@ CodeFormatCheck:
    # comparison # comparison
    - scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL - scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
    - git fetch upstream - git fetch upstream
    - echo "export FAIRSOFT_VERSION=jun19p1" > env.sh - echo "export FAIRSOFT_VERSION=apr21p2" > env.sh
    - echo "export FAIRROOT_VERSION=v18.2.0" >> env.sh - echo "export FAIRROOT_VERSION=v18.6.7" >> env.sh
    - echo "export SIMPATH=/cvmfs/fairroot.gsi.de/fairsoft/\${FAIRSOFT_VERSION}" >> env.sh - echo "export SIMPATH=/cvmfs/fairsoft.gsi.de/debian10/fairsoft/\${FAIRSOFT_VERSION}" >> env.sh
    - echo "export FAIRROOTPATH=/cvmfs/fairroot.gsi.de/fairroot/\${FAIRROOT_VERSION}_fairsoft-\${FAIRSOFT_VERSION}" >> env.sh - echo "export FAIRROOTPATH=/cvmfs/fairsoft.gsi.de/debian10/fairroot/\${FAIRROOT_VERSION}_fs_\${FAIRSOFT_VERSION}" >> env.sh
    - echo "export BUILDDIR=$PWD/build" >> env.sh - echo "export BUILDDIR=$PWD/build" >> env.sh
    - echo "export SOURCEDIR=$PWD" >> env.sh - echo "export SOURCEDIR=$PWD" >> env.sh
    - echo "export PATH=/cvmfs/fairroot.gsi.de/clang-format-11.0.0/bin:\$SIMPATH/bin:$PATH" >> env.sh - echo "export PATH=/cvmfs/fairroot.gsi.de/clang-format-11.0.0/bin:\$SIMPATH/bin:$PATH" >> env.sh
    - echo "export LABEL=format-check_MR-\${CI_MERGE_REQUEST_IID}" >> env.sh - echo "export LABEL=format-check_MR-\${CI_MERGE_REQUEST_IID}" >> env.sh
    - echo "export FAIRROOT_FORMAT_BASE=upstream/\${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" >> env.sh - echo "export FAIRROOT_FORMAT_BASE=upstream/\${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" >> env.sh
    - . ./env.sh && ctest -S cmake/scripts/checkformat.cmake -VV - . ./env.sh && ctest -S cmake/scripts/checkformat.cmake -VV
    FileFormatCheck: FileFormatCheck:
    stage: checkFormat stage: checkFormat
    image: alpine image: alpine
    ...@@ -197,8 +196,8 @@ FileLicenceCheck: ...@@ -197,8 +196,8 @@ FileLicenceCheck:
    EXTRA_PATH: /opt/cmake/3.20.1/bin EXTRA_PATH: /opt/cmake/3.20.1/bin
    NCPU: 16 NCPU: 16
    RAW_DATA_PATH: "/opt/cbmsoft/beamtime-test-data/reduced/" RAW_DATA_PATH: "/opt/cbmsoft/beamtime-test-data/reduced/"
    FAIRSOFT_VERSION: "jun19p2_root6" FAIRSOFT_VERSION: "apr21p2_root6"
    FAIRROOT_VERSION: "v18.2.1" FAIRROOT_VERSION: "v18.6.7"
    BASE_PATH: "/opt/cbmsoft" BASE_PATH: "/opt/cbmsoft"
    SIMPATH: "$BASE_PATH/fairsoft_$FAIRSOFT_VERSION/installation" SIMPATH: "$BASE_PATH/fairsoft_$FAIRSOFT_VERSION/installation"
    FAIRROOTPATH: "$BASE_PATH/fairroot_${FAIRROOT_VERSION}-fairsoft_${FAIRSOFT_VERSION}" FAIRROOTPATH: "$BASE_PATH/fairroot_${FAIRROOT_VERSION}-fairsoft_${FAIRSOFT_VERSION}"
    ...@@ -209,13 +208,13 @@ FileLicenceCheck: ...@@ -209,13 +208,13 @@ FileLicenceCheck:
    - CbmRoot_singularity - CbmRoot_singularity
    .singularity_debian10_variables_jun19: &singularity_debian10_variables_jun19 #.singularity_debian10_variables_jun19: &singularity_debian10_variables_jun19
    OS: debian10 # OS: debian10
    FAIRSOFT_VERSION: jun19p2 # FAIRSOFT_VERSION: jun19p2
    FAIRROOT_VERSION: v18.2.1 # FAIRROOT_VERSION: v18.2.1
    BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS" # BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" # SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}" # FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
    #.singularity_debian8_variables_jun19: &singularity_debian8_variables_jun19 #.singularity_debian8_variables_jun19: &singularity_debian8_variables_jun19
    # OS: debian8 # OS: debian8
    ...@@ -280,16 +279,16 @@ FileLicenceCheck: ...@@ -280,16 +279,16 @@ FileLicenceCheck:
    .linux_variables: &linux_variables .linux_variables: &linux_variables
    OS: "Debian10.11" OS: "Debian10.11"
    NCPU: 5 NCPU: 5
    FAIRSOFT_VERSION: "jun19p2" FAIRSOFT_VERSION: "apr21p2"
    FAIRROOT_VERSION: "v18.2.1" FAIRROOT_VERSION: "v18.6.7"
    BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian10" BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian10"
    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}" FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
    .macosx_tag: &macosx_tag #.macosx_tag: &macosx_tag
    stage: build # stage: build
    tags: # tags:
    - CbmRoot_macosx # - CbmRoot_macosx
    #.macosx_variables: &macosx_variables #.macosx_variables: &macosx_variables
    # OS: "macOS_10.13" # OS: "macOS_10.13"
    ...@@ -300,18 +299,18 @@ FileLicenceCheck: ...@@ -300,18 +299,18 @@ FileLicenceCheck:
    # SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" # SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
    # FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}" # FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
    .macosx_1015_tag: &macosx_1015_tag #.macosx_1015_tag: &macosx_1015_tag
    stage: build # stage: build
    tags: # tags:
    - CbmRoot_macosx_1015 # - CbmRoot_macosx_1015
    .macosx_1015_variables: &macosx_1015_variables #.macosx_1015_variables: &macosx_1015_variables
    OS: "macOS_10.15" # OS: "macOS_10.15"
    FAIRSOFT_VERSION: "jun19p1" # FAIRSOFT_VERSION: "jun19p1"
    FAIRROOT_VERSION: "v18.2.1" # FAIRROOT_VERSION: "v18.2.1"
    BASE_PATH: "/opt" # BASE_PATH: "/opt"
    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" # SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}" # FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
    .macosx_11_tag: &macosx_11_tag .macosx_11_tag: &macosx_11_tag
    stage: build stage: build
    ...@@ -368,10 +367,10 @@ CbmRoot_Merge_realData: ...@@ -368,10 +367,10 @@ CbmRoot_Merge_realData:
    variables: variables:
    <<: [*mergeRequestVariables, *realData_variables] <<: [*mergeRequestVariables, *realData_variables]
    CbmRoot_Merge_Singularity_debian10_jun19: #CbmRoot_Merge_Singularity_debian10_jun19:
    <<: [*singularity_tag, *check_merge_request, *build_and_test] # <<: [*singularity_tag, *check_merge_request, *build_and_test]
    variables: # variables:
    <<: [*mergeRequestVariables, *singularity_debian10_variables_jun19] # <<: [*mergeRequestVariables, *singularity_debian10_variables_jun19]
    #CbmRoot_Merge_Singularity_debian8_jun19: #CbmRoot_Merge_Singularity_debian8_jun19:
    # <<: [*singularity_tag, *check_merge_request, *build_and_test] # <<: [*singularity_tag, *check_merge_request, *build_and_test]
    ...@@ -403,20 +402,20 @@ CbmRoot_Merge_Singularity_centos7_apr21: ...@@ -403,20 +402,20 @@ CbmRoot_Merge_Singularity_centos7_apr21:
    variables: variables:
    <<: [*mergeRequestVariables, *singularity_centos7_variables_apr21] <<: [*mergeRequestVariables, *singularity_centos7_variables_apr21]
    CbmRoot_Merge: #CbmRoot_Merge:
    <<: [*linux_tag, *check_merge_request, *build_and_test] # <<: [*linux_tag, *check_merge_request, *build_and_test]
    variables: # variables:
    <<: [*mergeRequestVariables, *linux_variables] # <<: [*mergeRequestVariables, *linux_variables]
    #CbmRoot_Merge_macosx: #CbmRoot_Merge_macosx:
    # <<: [*macosx_tag, *check_merge_request, *build_and_test] # <<: [*macosx_tag, *check_merge_request, *build_and_test]
    # variables: # variables:
    # <<: [*mergeRequestVariables, *macosx_variables] # <<: [*mergeRequestVariables, *macosx_variables]
    CbmRoot_Merge_macosx_1015: #CbmRoot_Merge_macosx_1015:
    <<: [*macosx_1015_tag, *check_merge_request, *build_and_test] # <<: [*macosx_1015_tag, *check_merge_request, *build_and_test]
    variables: # variables:
    <<: [*mergeRequestVariables, *macosx_1015_variables] # <<: [*mergeRequestVariables, *macosx_1015_variables]
    CbmRoot_Merge_macosx_11: CbmRoot_Merge_macosx_11:
    <<: [*macosx_11_tag, *check_merge_request, *build_and_test] <<: [*macosx_11_tag, *check_merge_request, *build_and_test]
    ......
    external/CMakeLists.txt
    + 1
    − 0
    View file @ ee2726f5
    ...@@ -63,4 +63,5 @@ else() ...@@ -63,4 +63,5 @@ else()
    add_library(ANALYSISTREEQA SHARED IMPORTED GLOBAL) add_library(ANALYSISTREEQA SHARED IMPORTED GLOBAL)
    add_library(NICAFEMTO SHARED IMPORTED GLOBAL) add_library(NICAFEMTO SHARED IMPORTED GLOBAL)
    add_library(KFPARTICLE SHARED IMPORTED GLOBAL) add_library(KFPARTICLE SHARED IMPORTED GLOBAL)
    add_library(external::yaml-cpp STATIC IMPORTED GLOBAL)
    endif() endif()
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment