diff --git a/docker/ci-runner/Dockerfile b/docker/ci-runner/Dockerfile index 29852da6f9b65ab665ea0cd99b0b1d6a6d380f27..3a31e0438feeb8234d58ab8a0a6de7c19987129e 100644 --- a/docker/ci-runner/Dockerfile +++ b/docker/ci-runner/Dockerfile @@ -24,7 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-breathe \ python3-pip \ && \ - rm -rf /var/lib/apt/lists/* \ + rm -rf /var/lib/apt/lists/* RUN python3 -m pip install --upgrade pip RUN pip install --upgrade cookiecutter tox twine \ No newline at end of file diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index 99396659f3dc69400e3b724f09559c008efbbdac..1ef8720683e3a6d22dbb88035410ffe50f093e40 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -4,6 +4,13 @@ default: image: $CI_REGISTRY_IMAGE/ci-build-runner:$CI_COMMIT_REF_SLUG +workflow: + rules: + # Do not create (detached) pipelines on merge request events + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + when: never + - when: always + stages: - prepare - linting