From 2520571d0e80fa6c3ecd49d6ed4c491443b3b452 Mon Sep 17 00:00:00 2001
From: Bart Jaskulski <bjaskulski@protonmail.com>
Date: Fri, 17 Feb 2023 09:26:31 +0100
Subject: [PATCH] refactor: globally raise memory limit for composer ops
Signed-off-by: Bart Jaskulski <bjaskulski@protonmail.com>
---
gitlab-ci-1.2.yml | 1 +
includes/deploy.yml | 4 ++--
includes/prepare.yml | 2 +-
includes/tests/codeception.yml | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gitlab-ci-1.2.yml b/gitlab-ci-1.2.yml
index 7d4bcf7..78a43fb 100644
--- a/gitlab-ci-1.2.yml
+++ b/gitlab-ci-1.2.yml
@@ -7,6 +7,7 @@ variables:
MYSQL_INNODB_LOG_BUFFER_SIZE: "32M"
PHP_ERROR_REPORTING: "E_ALL"
COMPOSER_ALLOW_SUPERUSER: "1"
+ COMPOSER_MEMORY_LIMIT: "-1"
GIT_STRATEGY: "fetch"
CONTRIBUTORS: "wpdesk,dyszczo,grola,piotrpo,marcinkolanko"
MINIMAL_WP_TESTED_UP: "5.4"
diff --git a/includes/deploy.yml b/includes/deploy.yml
index 0f109e0..1a0a338 100644
--- a/includes/deploy.yml
+++ b/includes/deploy.yml
@@ -65,7 +65,7 @@ hooks docs refresh:
- 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
- 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 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
@@ -270,7 +270,7 @@ library:
- cp -rf ${CI_PROJECT_DIR}/* /tmp/wp-desk
- cp -rf /tmp/wp-desk/* ${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 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
diff --git a/includes/prepare.yml b/includes/prepare.yml
index 1c5aff5..f3e323d 100644
--- a/includes/prepare.yml
+++ b/includes/prepare.yml
@@ -22,7 +22,7 @@ prepare prefixed vendor:
- php --version
- apk update && apk upgrade && apk add git libxml2-dev
- docker-php-ext-install soap
- - COMPOSER_MEMORY_LIMIT=-1 && composer install
+ - composer install
prepare npm assets:
<<: *job-prepare
diff --git a/includes/tests/codeception.yml b/includes/tests/codeception.yml
index 0845859..1c48c29 100644
--- a/includes/tests/codeception.yml
+++ b/includes/tests/codeception.yml
@@ -47,7 +47,7 @@
- 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 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}
- mkdir -p ${APACHE_DOCUMENT_ROOT}
- cd ${APACHE_DOCUMENT_ROOT}
--
GitLab