diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70d94f562bc914d3edd8ac04fd1eca313c8e5975..b668b58f1035e1fd9bcecf148ffd9561e55918c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,11 +84,11 @@ conda_test_withcpl: # Rules are updated to only run this test on default branches. # Perhaps it could be ran on non-Draft MR branches? rules: - - if: $CI_COMMIT_TAG + #- if: $CI_COMMIT_TAG - if: $CI_COMMIT_BRANCH == 'master' - - if: $CI_COMMIT_BRANCH == 'develop' - - if: $CI_COMMIT_BRANCH =~ /^release\/.*$/ - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + #- 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 variables: MICADO_INTEGRATION_TESTS: "True" diff --git a/micadowise.yml b/micadowise.yml index 2b2e500929470c3c4c69e967415fbed1b1a238e9..389eac33b9cc9d10c1df91ee05bd1c2576e83326 100644 --- a/micadowise.yml +++ b/micadowise.yml @@ -18,7 +18,7 @@ dependencies: - pip - pip: - skycalc_ipy - - "ScopeSim==0.5.3" + - "ScopeSim==0.5.4" - "scopesim_templates==0.4.2" # ScopeSIM 0.2.0 breaks simulating a cluster for large detectors. # - ScopeSim==0.1.4