diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b668b58f1035e1fd9bcecf148ffd9561e55918c3..a13426a849271b43c9022d3e49ffd7d8555a76b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,7 +44,7 @@ simple_test: #- pip install --upgrade git+https://github.com/AstarVienna/ScopeSim.git@master - pip uninstall -y ScopeSIM_Templates - pip install ScopeSIM_Templates==0.4.2 - #- pip install --upgrade git+https://github.com/AstarVienna/ScopeSim_Templates.git@dev_master + #- pip install --upgrade git+https://github.com/AstarVienna/ScopeSim_Templates.git@master - pip uninstall -y irdb #- pip install --upgrade git+https://github.com/AstarVienna/irdb.git@master - python -c 'import scopesim; scopesim.download_packages(["Armazones", "ELT", "MICADO", "LFOA", "MAORY"])' @@ -89,7 +89,7 @@ conda_test_withcpl: #- if: $CI_COMMIT_BRANCH == 'develop' #- if: $CI_COMMIT_BRANCH =~ /^release\/.*$/ #- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - - if: $CI_PIPELINE_SOURCE == 'schedule' && $CONDA_BUILD_RUN_JOB + #- if: $CI_PIPELINE_SOURCE == 'schedule' && $CONDA_BUILD_RUN_JOB variables: MICADO_INTEGRATION_TESTS: "True"