From 50b2264cf0cd0ba47d99ca7e698d7c2bac9883d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3recki?= Date: Mon, 25 Nov 2024 14:22:31 +0100 Subject: [PATCH] [project-base] Fix Gitlab tests (#3618) --- .gitlab-ci.yml | 2 +- app/docker/php-fpm/Dockerfile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fbd461b142..6834c59631 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,7 @@ test:standards-with-graphql-schema-check: variables: GIT_STRATEGY: none script: - - docker run -i ${TAG} /bin/bash -c "mv PRODUCTION DEVELOPMENT; ./check-schema.sh && php phing composer-dev standards" + - docker run -i ${TAG} /bin/bash -c "mv PRODUCTION DEVELOPMENT; npm install format-graphql && ./check-schema.sh && php phing composer-dev standards" interruptible: true test:storefront-standards-with-codegen: diff --git a/app/docker/php-fpm/Dockerfile b/app/docker/php-fpm/Dockerfile index 370a789000..263c70bd63 100644 --- a/app/docker/php-fpm/Dockerfile +++ b/app/docker/php-fpm/Dockerfile @@ -19,8 +19,7 @@ USER www-data RUN composer install --optimize-autoloader --no-interaction --no-progress --no-dev \ && php phing build-deploy-part-1-db-independent clean -RUN rm -rf /var/www/html/node_modules \ - /var/www/html/tests +RUN rm -rf /var/www/html/node_modules RUN chmod +x ./deploy/deploy-project.sh && ./deploy/deploy-project.sh merge || true # Hack for monorepo to continue build