Use new env arg in MoCiTempGen

RWTH-EBC · Nov 28, 2024 · c82be23 · c82be23
1 parent ffc3441
commit c82be23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ci-tests/config/templates_generator_config.toml b/ci-tests/config/templates_generator_config.toml
@@ -9,7 +9,7 @@ templates_store_local_path = "D:\\04_git\\BESMod"
 templates_store_project = ""
 templates_store_folder = "ci-tests"
 templates_store_branch_name = ""
-conda_environment = "python39"
+activate_python_environment = 'eval "$(micromamba shell hook --shell bash)" && micromamba activate base'
 main_branch = "main"
 html_praefix = "correct_HTML_"
 expire_in_time = "7h"

diff --git a/ci-tests/scripts/utilities.yml b/ci-tests/scripts/utilities.yml
@@ -1,5 +1,5 @@
 # Variables
-# conda_environment: python39
+# activate_python_environment: eval "$(micromamba shell hook --shell bash)" && micromamba activate base
 # modelica_py_ci_url: https://github.com/RWTH-EBC/ModelicaPyCI.git
 # ci_toml_path: ci-tests/config/modelica_py_ci_config.toml
 # commit_string: $CI_COMMIT_MESSAGE  !~ /ci_update_ref/   && $CI_COMMIT_MESSAGE  !~ /ci_show_ref/ && $CI_COMMIT_MESSAGE  !~ /ci_dif_ref/ && $CI_COMMIT_MESSAGE  !~ /ci_create_model_whitelist/ && $CI_COMMIT_MESSAGE  !~ /ci_create_html_whitelist/ && $CI_COMMIT_MESSAGE  !~ /ci_create_example_whitelist/ && $CI_COMMIT_MESSAGE  !~ /ci_simulate/ && $CI_COMMIT_MESSAGE  !~ /ci_om_simulate/ && $CI_COMMIT_MESSAGE  !~ /ci_check/ && $CI_COMMIT_MESSAGE  !~ /ci_om_check/ && $CI_COMMIT_MESSAGE  !~ /ci_regression_test/ && $CI_COMMIT_MESSAGE  !~ /ci_html/ && $CI_COMMIT_MESSAGE  !~ /ci_setting/ && $CI_COMMIT_MESSAGE  !~ /ci_style_check/ && $CI_COMMIT_MESSAGE  !~ /ci_trigger_ibpsa/ && $CI_COMMIT_MESSAGE  !~ /ci_merge_except/ && $CI_COMMIT_MESSAGE  !~ /ci_correct_html/ && $CI_COMMIT_MESSAGE  !~ /ci_build_structure/ && $CI_COMMIT_MESSAGE  !~ /ci_build_whitelist/ && $CI_COMMIT_MESSAGE  !~ /ci_reference_check/ && $CI_COMMIT_MESSAGE  !~ /ci_check_naming/
@@ -23,7 +23,7 @@
 .activate_python_and_install_requirements:
   script:
     - export PIP_CACHE_DIR="/opt/cache/pip"
-    - eval "$(micromamba shell hook --shell bash)" && micromamba activate base || echo "micromamba base is not installed, can't activate it"
+    - eval "$(micromamba shell hook --shell bash)" && micromamba activate base || echo "Could not activate python environment"
     - pip install --upgrade pip && pip install natsort toml pandas mako requests
     - export PYTHONIOENCODING=utf-8
     - pip install git+https://github.com/FWuellhorst/BuildingsPy.git@issue253_coverage