diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1edaace7..f9ff1a392 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,7 +103,7 @@ Build and Install: - rm -rf ${CI_PROJECT_DIR}/build && mkdir ${CI_PROJECT_DIR}/build && cd ${CI_PROJECT_DIR}/build - rm -rf ${CI_PROJECT_DIR}/install - cmake ${CI_PROJECT_DIR} -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install - -DREST_GARFIELD=ON -DREST_G4=ON -DRESTLIB_DETECTOR=ON -DRESTLIB_RAW=ON -DRESTLIB_TRACK=ON -DREST_WELCOME=OFF + -DREST_GARFIELD=ON -DREST_G4=ON -DRESTLIB_DETECTOR=ON -DRESTLIB_RAW=ON -DRESTLIB_TRACK=ON -DRESTLIB_AXION=ON -DREST_WELCOME=OFF - make install -j2 artifacts: diff --git a/pull-submodules.py b/pull-submodules.py index 47caf19e0..730f6c167 100644 --- a/pull-submodules.py +++ b/pull-submodules.py @@ -24,6 +24,21 @@ clean = False fbName = "" +if( len(sys.argv ) <= 1 ): + print( " " ) + print( "pull-submodules.py requires arguments." ) + print( " " ) + print( " - clean : It will restore all submodules to the official release versions" ) + print( " - latest : It will pull the master branch of each submodule" ) + print( " " ) + print( "Usage: " ) + print( "python3 pull-submodules.py --clean" ) + print( "python3 pull-submodules.py --latest" ) + print ( " ") + print( "When using --clean make sure the framework local repository is at an official release" ) + print ( " " ) + sys.exit(1) + exclude_elems = "" for x in range(len(sys.argv) - 1): if sys.argv[x + 1] == "--lfna":