diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 095a9f5a26c3792637f994f3ad29d7a7e40090f3..4b78241a5ae19d1a6aafe22c39046c59b5367a5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: POSTGRES_PASSWORD: $CI_POSTGRES_PASSWORD include: - template: Dependency-Scanning.gitlab-ci.yml + template: Security/Dependency-Scanning.gitlab-ci.yml cache: key: "pip-cache" @@ -82,8 +82,6 @@ build_test_image: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker pull $DEV_IMAGE_BASE || true - docker build --network=host --cache-from $DEV_IMAGE_BASE -t $DEV_IMAGE_BASE --target node . - - docker push $DEV_IMAGE_BASE - - docker image prune --filter label=stage=intermediate - docker pull $DEV_IMAGE || true - docker build --network=host --cache-from $DEV_IMAGE --cache-from $DEV_IMAGE_BASE -t $DEV_IMAGE . - docker push $DEV_IMAGE diff --git a/util/factory_boys.py b/util/factory_boys.py index 75faa8ae8930a3aa5e693eab4e690dcf9d7db27a..6c7ea211887748be5e6341e8408aa6e0a0cabf33 100644 --- a/util/factory_boys.py +++ b/util/factory_boys.py @@ -87,7 +87,7 @@ class SubmissionFactory(DjangoModelFactory): class Meta: model = models.Submission - text = factory.Sequence(lambda n: f'#include<stdio.h>\n\nint main() {{\n\tprintf("Hello World\\n");\n\treturn {n};\n}}') # noqa + text = factory.Sequence(lambda n: f'#include<stdio.h>\n\nint main() {{\nprintf("Hello World\\n");\nreturn {n};\n}}') # noqa type = factory.SubFactory(SubmissionTypeFactory) student = factory.SubFactory(StudentInfoFactory)