diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9940ee992..90a2d3e7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ variables: GIT_CLEAN_FLAGS: "-ffdx" # Change pip's cache directory to be inside the project directory since we can only cache local items. PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" - EXTRA_VALUES_ACCEPTANCE: '--values ./secrets/config/common/common.yaml --values ./secrets/config/common/cryptnono.yaml --values ./secrets/config/common/gesis.yaml --values ./secrets/config/gesis-acceptance.yaml --values ./config/gesis.yml --values ./config/gesis-acceptance.yml' + EXTRA_VALUES_ACCEPTANCE: "--values ./secrets/config/common/common.yaml --values ./secrets/config/common/cryptnono.yaml --values ./secrets/config/common/gesis.yaml --values ./secrets/config/gesis-acceptance.yaml --values ./config/gesis.yml --values ./config/gesis-acceptance.yml" # This workflow:rules are required to enable merge request pipelines! workflow: @@ -53,7 +53,7 @@ include: stage: lint dir: mybinder extra_values: ${EXTRA_VALUES_ACCEPTANCE} - git_crypt: 'true' + git_crypt: "true" rules: - if: $CI_SERVER_FQDN == "git.gesis.org" && $CI_PIPELINE_SOURCE == 'merge_request_event' - if: $CI_SERVER_FQDN == "git.gesis.org" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH @@ -65,6 +65,6 @@ include: dir: mybinder k8s_context: methods-hub/binder.methodshub.gesis.org:acceptance extra_values: ${EXTRA_VALUES_ACCEPTANCE} - git_crypt: 'true' + git_crypt: "true" rules: - if: $CI_SERVER_FQDN == "git.gesis.org" && $CI_PIPELINE_SOURCE == 'merge_request_event'