Skip to content
Snippets Groups Projects
Verified Commit 1db57a7f authored by Bartek Jaskulski's avatar Bartek Jaskulski
Browse files

Merge branch 'master' into improve-parallelization

parents 15a8370d 466cc5e5
Branches
No related tags found
No related merge requests found
...@@ -7,6 +7,7 @@ variables: ...@@ -7,6 +7,7 @@ variables:
MYSQL_INNODB_LOG_BUFFER_SIZE: "32M" MYSQL_INNODB_LOG_BUFFER_SIZE: "32M"
PHP_ERROR_REPORTING: "E_ALL" PHP_ERROR_REPORTING: "E_ALL"
COMPOSER_ALLOW_SUPERUSER: "1" COMPOSER_ALLOW_SUPERUSER: "1"
COMPOSER_MEMORY_LIMIT: "-1"
GIT_STRATEGY: "fetch" GIT_STRATEGY: "fetch"
CONTRIBUTORS: "wpdesk,dyszczo,grola,piotrpo,marcinkolanko" CONTRIBUTORS: "wpdesk,dyszczo,grola,piotrpo,marcinkolanko"
MINIMAL_WP_TESTED_UP: "5.4" MINIMAL_WP_TESTED_UP: "5.4"
......
...@@ -68,7 +68,7 @@ hooks docs refresh: ...@@ -68,7 +68,7 @@ hooks docs refresh:
- cp -rf /tmp/release/* ${CI_PROJECT_DIR}/release/${CI_PROJECT_NAME} - cp -rf /tmp/release/* ${CI_PROJECT_DIR}/release/${CI_PROJECT_NAME}
- if [ -d "/tmp/release/.wordpress-org" ]; then mkdir ${CI_PROJECT_DIR}/release/${CI_PROJECT_NAME}/.wordpress-org && cp -rf /tmp/release/.wordpress-org/* ${CI_PROJECT_DIR}/release/${CI_PROJECT_NAME}/.wordpress-org; fi - if [ -d "/tmp/release/.wordpress-org" ]; then mkdir ${CI_PROJECT_DIR}/release/${CI_PROJECT_NAME}/.wordpress-org && cp -rf /tmp/release/.wordpress-org/* ${CI_PROJECT_DIR}/release/${CI_PROJECT_NAME}/.wordpress-org; fi
- cd ${CI_PROJECT_DIR}/release/${CI_PROJECT_NAME} - cd ${CI_PROJECT_DIR}/release/${CI_PROJECT_NAME}
- COMPOSER_MEMORY_LIMIT=-1 && php -d memory_limit=-1 /usr/local/bin/composer install --no-dev --no-progress --optimize-autoloader --prefer-dist - php -d memory_limit=-1 /usr/local/bin/composer install --no-dev --no-progress --optimize-autoloader --prefer-dist
- rm -rf build-coverage release tests docs .git .editorconfig .gitignore .gitlab-ci.yml apigen.neon phpunit.xml acceptance test_soap.php .gitlab - rm -rf build-coverage release tests docs .git .editorconfig .gitignore .gitlab-ci.yml apigen.neon phpunit.xml acceptance test_soap.php .gitlab
- rm -rf composer.json composer.lock phpcs.xml.dist phpunit-integration.xml phpunit-unit.xml composer.phar wp-cli.phar functional tmp_artifacts .tmp tools codeception.dist.yml .env.testing wp-install.sh - rm -rf composer.json composer.lock phpcs.xml.dist phpunit-integration.xml phpunit-unit.xml composer.phar wp-cli.phar functional tmp_artifacts .tmp tools codeception.dist.yml .env.testing wp-install.sh
- rm -rf phpcs.xml.dist phpunit-integration.xml phpunit-unit.xml wp-cli.phar functional tmp_artifacts scoper.inc.php phpstan.dist phpstan.neon.dist - rm -rf phpcs.xml.dist phpunit-integration.xml phpunit-unit.xml wp-cli.phar functional tmp_artifacts scoper.inc.php phpstan.dist phpstan.neon.dist
...@@ -273,7 +273,7 @@ library: ...@@ -273,7 +273,7 @@ library:
- cp -rf ${CI_PROJECT_DIR}/* /tmp/wp-desk - cp -rf ${CI_PROJECT_DIR}/* /tmp/wp-desk
- cp -rf /tmp/wp-desk/* ${CI_PROJECT_DIR}/wp-desk/${CI_PROJECT_NAME} - cp -rf /tmp/wp-desk/* ${CI_PROJECT_DIR}/wp-desk/${CI_PROJECT_NAME}
- cd ${CI_PROJECT_DIR}/wp-desk/${CI_PROJECT_NAME} - cd ${CI_PROJECT_DIR}/wp-desk/${CI_PROJECT_NAME}
- COMPOSER_MEMORY_LIMIT=-1 && php -d memory_limit=-1 /usr/local/bin/composer install --no-dev --no-progress --optimize-autoloader --prefer-dist - php -d memory_limit=-1 /usr/local/bin/composer install --no-dev --no-progress --optimize-autoloader --prefer-dist
- rm -rf build-coverage wp-desk release tests docs .git .editorconfig .gitignore .gitlab-ci.yml apigen.neon phpunit.xml acceptance test_soap.php .gitlab - rm -rf build-coverage wp-desk release tests docs .git .editorconfig .gitignore .gitlab-ci.yml apigen.neon phpunit.xml acceptance test_soap.php .gitlab
- rm -rf composer.json composer.lock phpcs.xml.dist phpunit-integration.xml phpunit-unit.xml composer.phar wp-cli.phar functional tmp_artifacts .tmp tools - rm -rf composer.json composer.lock phpcs.xml.dist phpunit-integration.xml phpunit-unit.xml composer.phar wp-cli.phar functional tmp_artifacts .tmp tools
- rm -rf assets-src package.json package-lock.json .babelrc weback.mix.js - rm -rf assets-src package.json package-lock.json .babelrc weback.mix.js
......
...@@ -2,14 +2,10 @@ ...@@ -2,14 +2,10 @@
tags: tags:
- metrics - metrics
stage: tools stage: tools
image: composer:2.0 image: gitlab.wpdesk.dev:5050/wpdesk/docker-tests/php-box:7.4
allow_failure: true allow_failure: true
needs: needs:
- prepare prefixed vendor - prepare prefixed vendor
before_script:
- apk add --update --no-cache libxml2-dev libzip zip libzip-dev
- docker-php-ext-install soap
- docker-php-ext-install zip
phpmetric metrics: phpmetric metrics:
<<: *job-metrics <<: *job-metrics
......
...@@ -17,7 +17,7 @@ prepare prefixed vendor: ...@@ -17,7 +17,7 @@ prepare prefixed vendor:
- php --version - php --version
- apk update && apk upgrade && apk add git libxml2-dev - apk update && apk upgrade && apk add git libxml2-dev
- docker-php-ext-install soap - docker-php-ext-install soap
- COMPOSER_MEMORY_LIMIT=-1 && composer install - composer install
prepare npm assets: prepare npm assets:
image: node:16.10 image: node:16.10
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
- mkdir -p /project - mkdir -p /project
- if [ -f ${CI_PROJECT_DIR}/tests/codeception/bootstrap.sh ]; then cp -r ${CI_PROJECT_DIR}/. /project; fi - if [ -f ${CI_PROJECT_DIR}/tests/codeception/bootstrap.sh ]; then cp -r ${CI_PROJECT_DIR}/. /project; fi
- if [ -f ${CI_PROJECT_DIR}/tests/codeception/bootstrap.sh ]; then cd /project; fi - if [ -f ${CI_PROJECT_DIR}/tests/codeception/bootstrap.sh ]; then cd /project; fi
- if [ -f ${CI_PROJECT_DIR}/tests/codeception/bootstrap.sh ]; then COMPOSER_MEMORY_LIMIT=-1 composer install --no-progress --prefer-dist --no-dev; fi - if [ -f ${CI_PROJECT_DIR}/tests/codeception/bootstrap.sh ]; then composer install --no-progress --prefer-dist --no-dev; fi
- cd ${CI_PROJECT_DIR} - cd ${CI_PROJECT_DIR}
- mkdir -p ${APACHE_DOCUMENT_ROOT} - mkdir -p ${APACHE_DOCUMENT_ROOT}
- cd ${APACHE_DOCUMENT_ROOT} - cd ${APACHE_DOCUMENT_ROOT}
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
stage: tests stage: tests
script: script:
- composer install --no-dev - composer install --no-dev
- find -name '*.php' -print0 | xargs -n1 -0 -P16 php -l >/dev/null - find -name '*.php' -print0 |xargs -n1 -0 -P16 php -l |grep -v "No syntax errors detected" || exit 0
lint:8.1: lint:8.2:
<<: *lint-tmpl <<: *lint-tmpl
image: gitlab.wpdesk.dev:5050/wpdesk/docker-tests/php-box:8.1 image: gitlab.wpdesk.dev:5050/wpdesk/docker-tests/php-box:8.2
lint:7.2: lint:7.2:
<<: *lint-tmpl <<: *lint-tmpl
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment