From 271d6d673fd6c65c5627ae0a91c72074aa6efd7f Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 09:30:23 -0700 Subject: [PATCH 01/18] Add composer/installers, update strauss to v16, no longer delete vendor packages --- composer.json | 13 ++-- composer.lock | 161 +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 161 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 136961e49..d23357d27 100644 --- a/composer.json +++ b/composer.json @@ -5,8 +5,13 @@ "homepage": "https://www.kadencewp.com", "config": { "preferred-install": "dist", + "sort-packages": true, + "optimize-autoloader": true, "platform": { "php": "7.2.34" + }, + "allow-plugins": { + "composer/installers": true } }, "repositories": [ @@ -28,6 +33,7 @@ } ], "require": { + "composer/installers": "*", "psr/container": "^1.0", "lucatume/di52": "^3.3", "stellarwp/telemetry": "^2.3", @@ -62,7 +68,7 @@ "vendor/bin/stellar-uplink domain=kadence-blocks" ], "strauss": [ - "test -f ./bin/strauss.phar || curl -o bin/strauss.phar -L -C - https://github.com/BrianHenryIE/strauss/releases/download/0.14.1/strauss.phar", + "test -f ./bin/strauss.phar || curl -o bin/strauss.phar -L -C - https://github.com/BrianHenryIE/strauss/releases/download/0.16.0/strauss.phar", "@php bin/strauss.phar", "@composer dump-autoload" ], @@ -87,13 +93,10 @@ "classmap_prefix": "Kadence_Blocks_", "constant_prefix": "KADENCE_BLOCKS_", "namespace_prefix": "KadenceWP\\KadenceBlocks\\", - "delete_vendor_packages": true, + "delete_vendor_packages": false, "exclude_from_prefix": { "file_patterns": [ "/symfony\\/polyfill-(.*)/" - ], - "packages": [ - "symfony/service-contracts" ] } } diff --git a/composer.lock b/composer.lock index 21295a0e8..26412c1f7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "46dc3fe8ddd36ffd5288899e5ce3bbc2", + "content-hash": "543e8aed6656e14be41a94ca57de2ff2", "packages": [ { "name": "adbario/php-dot-notation", @@ -59,6 +59,151 @@ }, "time": "2022-10-14T20:31:46+00:00" }, + { + "name": "composer/installers", + "version": "v2.2.0", + "source": { + "type": "git", + "url": "https://github.com/composer/installers.git", + "reference": "c29dc4b93137acb82734f672c37e029dfbd95b35" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/installers/zipball/c29dc4b93137acb82734f672c37e029dfbd95b35", + "reference": "c29dc4b93137acb82734f672c37e029dfbd95b35", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "composer/composer": "1.6.* || ^2.0", + "composer/semver": "^1 || ^3", + "phpstan/phpstan": "^0.12.55", + "phpstan/phpstan-phpunit": "^0.12.16", + "symfony/phpunit-bridge": "^5.3", + "symfony/process": "^5" + }, + "type": "composer-plugin", + "extra": { + "class": "Composer\\Installers\\Plugin", + "branch-alias": { + "dev-main": "2.x-dev" + }, + "plugin-modifies-install-path": true + }, + "autoload": { + "psr-4": { + "Composer\\Installers\\": "src/Composer/Installers" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kyle Robinson Young", + "email": "kyle@dontkry.com", + "homepage": "https://github.com/shama" + } + ], + "description": "A multi-framework Composer library installer", + "homepage": "https://composer.github.io/installers/", + "keywords": [ + "Dolibarr", + "Eliasis", + "Hurad", + "ImageCMS", + "Kanboard", + "Lan Management System", + "MODX Evo", + "MantisBT", + "Mautic", + "Maya", + "OXID", + "Plentymarkets", + "Porto", + "RadPHP", + "SMF", + "Starbug", + "Thelia", + "Whmcs", + "WolfCMS", + "agl", + "annotatecms", + "attogram", + "bitrix", + "cakephp", + "chef", + "cockpit", + "codeigniter", + "concrete5", + "croogo", + "dokuwiki", + "drupal", + "eZ Platform", + "elgg", + "expressionengine", + "fuelphp", + "grav", + "installer", + "itop", + "known", + "kohana", + "laravel", + "lavalite", + "lithium", + "magento", + "majima", + "mako", + "matomo", + "mediawiki", + "miaoxing", + "modulework", + "modx", + "moodle", + "osclass", + "pantheon", + "phpbb", + "piwik", + "ppi", + "processwire", + "puppet", + "pxcms", + "reindex", + "roundcube", + "shopware", + "silverstripe", + "sydes", + "sylius", + "tastyigniter", + "wordpress", + "yawik", + "zend", + "zikula" + ], + "support": { + "issues": "https://github.com/composer/installers/issues", + "source": "https://github.com/composer/installers/tree/v2.2.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-08-20T06:45:11+00:00" + }, { "name": "graham-campbell/result-type", "version": "v1.1.2", @@ -3437,16 +3582,16 @@ }, { "name": "doctrine/inflector", - "version": "2.0.9", + "version": "2.0.10", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65" + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/2930cd5ef353871c821d5c43ed030d39ac8cfe65", - "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc", + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc", "shasum": "" }, "require": { @@ -3508,7 +3653,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.9" + "source": "https://github.com/doctrine/inflector/tree/2.0.10" }, "funding": [ { @@ -3524,7 +3669,7 @@ "type": "tidelift" } ], - "time": "2024-01-15T18:05:13+00:00" + "time": "2024-02-18T20:23:39+00:00" }, { "name": "doctrine/instantiator", @@ -9959,5 +10104,5 @@ "platform-overrides": { "php": "7.2.34" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 8bc1a5cedff8c41de352cedbd7b8d0ef8c981cae Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 09:31:04 -0700 Subject: [PATCH 02/18] Uncomment composer validate, use ramsey/composer-install@v2 which handles caching --- .github/workflows/test-php.yml | 39 ++++------------------------------ 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index 0a9ed4bca..2de83275e 100644 --- a/.github/workflows/test-php.yml +++ b/.github/workflows/test-php.yml @@ -33,42 +33,11 @@ jobs: - name: Install composer run: sudo composer self-update --stable - # Composer validate doesn't like our type of "wordpress-plugin" - # - name: Validate composer.json and composer.lock - # run: composer validate + - name: Validate composer.json and composer.lock + run: composer validate - - name: Cache Composer packages - id: composer-cache - uses: actions/cache@v4 - with: - path: | - vendor - vendor-prod - key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} - - - name: Install composer dependencies - if: steps.composer-cache.outputs.cache-hit != 'true' - env: - COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ secrets.COMPOSER_TOKEN }}"}}' - run: | - composer config store-auths false - composer install --no-progress --no-suggest --ignore-platform-reqs - - - name: Install composer vendor-prod - if: steps.composer-cache.outputs.cache-hit != 'true' - env: - COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ secrets.COMPOSER_TOKEN }}"}}' - COMPOSER_VENDOR_DIR: vendor-prod - run: | - composer config store-auths false - composer install --prefer-dist --no-dev --no-ansi --no-interaction - composer du -a --no-dev --no-ansi --no-interaction - - - name: Generate autoloader - if: steps.composer-cache.outputs.cache-hit == 'true' - run: composer du + - name: Install Composer dependencies + uses: ramsey/composer-install@v2 - name: Setup environment run: envsubst < tests/docker-compose.codeception.env > tests/codeception.env From b32bbdfb299787f61326e403e3387f834edce84d Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 09:35:07 -0700 Subject: [PATCH 03/18] use specific version for composer/installers --- composer.json | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d23357d27..64aa4d9d3 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ } ], "require": { - "composer/installers": "*", + "composer/installers": "^2.0", "psr/container": "^1.0", "lucatume/di52": "^3.3", "stellarwp/telemetry": "^2.3", diff --git a/composer.lock b/composer.lock index 26412c1f7..9c6ea84d8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "543e8aed6656e14be41a94ca57de2ff2", + "content-hash": "47a4074726db0b48e5e80d3d4ca819bd", "packages": [ { "name": "adbario/php-dot-notation", From 5bc26c32535834e6895fda38a7b52ac295213506 Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 09:35:21 -0700 Subject: [PATCH 04/18] fix typo causing failing validation --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 64aa4d9d3..00262670f 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "kadencewp/kadence-blocks", - "dsecription": "Kadence Blocks - Gutenberg Blocks for Page Building", + "description": "Kadence Blocks - Gutenberg Blocks for Page Building", "type": "wordpress-plugin", "homepage": "https://www.kadencewp.com", "config": { From 92f7f1493f69e535716d54740204f9eaf30a39dc Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 09:36:47 -0700 Subject: [PATCH 05/18] Add license --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 00262670f..ce3fdec5f 100644 --- a/composer.json +++ b/composer.json @@ -3,6 +3,7 @@ "description": "Kadence Blocks - Gutenberg Blocks for Page Building", "type": "wordpress-plugin", "homepage": "https://www.kadencewp.com", + "license": "GPL-2.0-or-later", "config": { "preferred-install": "dist", "sort-packages": true, From 9e5d63925a34701463661b57bcd049b7918f9433 Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 09:41:08 -0700 Subject: [PATCH 06/18] Add composer token --- .github/workflows/test-php.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index 2de83275e..b26f25584 100644 --- a/.github/workflows/test-php.yml +++ b/.github/workflows/test-php.yml @@ -3,6 +3,9 @@ run-name: '[Test] ${{ github.event.head_commit.message }}' on: [push, workflow_dispatch] +env: + COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ secrets.COMPOSER_TOKEN }}"}}' + jobs: test: runs-on: ubuntu-latest From 55b85747a02c8ab03cb2baa77ef41767473f243e Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 09:46:57 -0700 Subject: [PATCH 07/18] enable WP_DEBUG in docker container --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index cf3bb312e..57cedd8a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,7 @@ services: WORDPRESS_DB_USER: wp WORDPRESS_DB_PASSWORD: pass WORDPRESS_SKIP_INSTALL: 'yes' + WORDPRESS_DEBUG: 1 volumes: - ./:/var/www/html/wp-content/plugins/kadence-blocks depends_on: From d922aaf070ff19cdeaa0b931f6e689200324d97a Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 09:50:26 -0700 Subject: [PATCH 08/18] Remove manual composer install, use set up PHP --- .github/workflows/test-php.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index b26f25584..438750a32 100644 --- a/.github/workflows/test-php.yml +++ b/.github/workflows/test-php.yml @@ -22,6 +22,11 @@ jobs: - uses: actions/checkout@v4 + - name: Set up PHP + uses: shivammathur/setup-php@v2 + with: + php-version: "${{ matrix.php }}" + - uses: oven-sh/setup-bun@v1 with: bun-version: latest @@ -33,9 +38,6 @@ jobs: - name: Build packages run: bun run build - - name: Install composer - run: sudo composer self-update --stable - - name: Validate composer.json and composer.lock run: composer validate From 5b15834ee8ee0e5cdcb0166bc92d408f81f3335b Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 09:54:09 -0700 Subject: [PATCH 09/18] Add healthcheck to mariadb --- docker-compose.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 57cedd8a1..10cf090e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,6 +24,18 @@ services: db: image: mariadb:10.5 restart: always + healthcheck: + interval: 30s + retries: 3 + test: + [ + "CMD", + "healthcheck.sh", + "--su-mysql", + "--connect", + "--innodb_initialized" + ] + timeout: 30s ports: - ${DB_PORT}:3306 environment: From 650188935df770deb5a3c97443d959541bdbc18f Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 10:01:57 -0700 Subject: [PATCH 10/18] No longer manually install docker --- .github/workflows/test-php.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index 438750a32..a390b290b 100644 --- a/.github/workflows/test-php.yml +++ b/.github/workflows/test-php.yml @@ -62,8 +62,11 @@ jobs: run: | sed -i -e 's/WP_VERSION=""/WP_VERSION="nightly"/g' tests/codeception.env - - name: Setup docker - run: ./bin/setup-docker.sh + - name: Start project containers + run: ./bin/test-up.sh + + - name: Wait for project to be ready + run: ./bin/wait-for-it.sh http://localhost:7253 - name: Run tests run: | From 4bbf05b1056732dacac03288bfe37d91019bf99b Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 10:08:42 -0700 Subject: [PATCH 11/18] bump mariadb version, update healthcheck --- docker-compose.yml | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 10cf090e8..8f7e529ae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,34 +12,31 @@ services: environment: WORDPRESS_DB_HOST: db WORDPRESS_DB_NAME: wp - WORDPRESS_DB_USER: wp + WORDPRESS_DB_USER: root WORDPRESS_DB_PASSWORD: pass WORDPRESS_SKIP_INSTALL: 'yes' WORDPRESS_DEBUG: 1 volumes: - ./:/var/www/html/wp-content/plugins/kadence-blocks depends_on: - - db + db: + condition: service_healthy db: - image: mariadb:10.5 + image: mariadb:10.7.8 restart: always - healthcheck: - interval: 30s - retries: 3 - test: - [ - "CMD", - "healthcheck.sh", - "--su-mysql", - "--connect", - "--innodb_initialized" - ] - timeout: 30s + healthcheck: # The `wp` db should exist. + test: mysqlshow -u root -proot wp + start_period: 5s + interval: 1s + timeout: 3s + retries: 30 ports: - ${DB_PORT}:3306 environment: MYSQL_DATABASE: wp MYSQL_USER: wp MYSQL_PASSWORD: pass - MYSQL_RANDOM_ROOT_PASSWORD: '1' + MYSQL_ROOT_PASSWORD: root + tmpfs: + - /var/lib/mysql From e006810262b9c702a4542ae957b18552535489c4 Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 10:10:55 -0700 Subject: [PATCH 12/18] Use the correct password in healthcheck --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8f7e529ae..b7998c550 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: WORDPRESS_DB_HOST: db WORDPRESS_DB_NAME: wp WORDPRESS_DB_USER: root - WORDPRESS_DB_PASSWORD: pass + WORDPRESS_DB_PASSWORD: password WORDPRESS_SKIP_INSTALL: 'yes' WORDPRESS_DEBUG: 1 volumes: @@ -26,7 +26,7 @@ services: image: mariadb:10.7.8 restart: always healthcheck: # The `wp` db should exist. - test: mysqlshow -u root -proot wp + test: mysqlshow -u root -ppassword wp start_period: 5s interval: 1s timeout: 3s @@ -36,7 +36,7 @@ services: environment: MYSQL_DATABASE: wp MYSQL_USER: wp - MYSQL_PASSWORD: pass + MYSQL_PASSWORD: password MYSQL_ROOT_PASSWORD: root tmpfs: - /var/lib/mysql From 7e9caf7d8a4ba751bb148b224f67a55a96a11511 Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 10:11:50 -0700 Subject: [PATCH 13/18] use root user --- docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b7998c550..114a21522 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,8 +35,6 @@ services: - ${DB_PORT}:3306 environment: MYSQL_DATABASE: wp - MYSQL_USER: wp - MYSQL_PASSWORD: password - MYSQL_ROOT_PASSWORD: root + MYSQL_ROOT_PASSWORD: password tmpfs: - /var/lib/mysql From 7ad6f189283298104ae75328137021949deb71b2 Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 10:12:41 -0700 Subject: [PATCH 14/18] update codeception env vars --- tests/codeception.env | 4 ++-- tests/docker-compose.codeception.env | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/codeception.env b/tests/codeception.env index bdb90ae2c..c26079406 100644 --- a/tests/codeception.env +++ b/tests/codeception.env @@ -16,6 +16,6 @@ TEST_SITE_ADMIN_PASSWORD="admin" TEST_DB_NAME="wp" TEST_DB_HOST="db" -TEST_DB_USER="wp" -TEST_DB_PASSWORD="pass" +TEST_DB_USER="root" +TEST_DB_PASSWORD="password" TEST_TABLE_PREFIX="wp_" diff --git a/tests/docker-compose.codeception.env b/tests/docker-compose.codeception.env index bdb90ae2c..c26079406 100644 --- a/tests/docker-compose.codeception.env +++ b/tests/docker-compose.codeception.env @@ -16,6 +16,6 @@ TEST_SITE_ADMIN_PASSWORD="admin" TEST_DB_NAME="wp" TEST_DB_HOST="db" -TEST_DB_USER="wp" -TEST_DB_PASSWORD="pass" +TEST_DB_USER="root" +TEST_DB_PASSWORD="password" TEST_TABLE_PREFIX="wp_" From d681018afa81c82e2739cdaab29c643ed1b54ddb Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 10:13:28 -0700 Subject: [PATCH 15/18] update for acceptance tests --- tests/codeception.env | 4 ++-- tests/docker-compose.codeception.env | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/codeception.env b/tests/codeception.env index c26079406..24d66ed5f 100644 --- a/tests/codeception.env +++ b/tests/codeception.env @@ -5,8 +5,8 @@ TEST_SITE_WP_ADMIN_PATH="/wp-admin" TEST_SITE_DB_NAME="wp" TEST_SITE_DB_HOST="db" TEST_SITE_DB_PORT="3306" -TEST_SITE_DB_USER="wp" -TEST_SITE_DB_PASSWORD="pass" +TEST_SITE_DB_USER="root" +TEST_SITE_DB_PASSWORD="password" TEST_SITE_TABLE_PREFIX="wp_" TEST_SITE_WP_URL="http://localhost" TEST_SITE_WP_DOMAIN="localhost" diff --git a/tests/docker-compose.codeception.env b/tests/docker-compose.codeception.env index c26079406..24d66ed5f 100644 --- a/tests/docker-compose.codeception.env +++ b/tests/docker-compose.codeception.env @@ -5,8 +5,8 @@ TEST_SITE_WP_ADMIN_PATH="/wp-admin" TEST_SITE_DB_NAME="wp" TEST_SITE_DB_HOST="db" TEST_SITE_DB_PORT="3306" -TEST_SITE_DB_USER="wp" -TEST_SITE_DB_PASSWORD="pass" +TEST_SITE_DB_USER="root" +TEST_SITE_DB_PASSWORD="password" TEST_SITE_TABLE_PREFIX="wp_" TEST_SITE_WP_URL="http://localhost" TEST_SITE_WP_DOMAIN="localhost" From ecbab1cf42bd9328e850de640fb68b05e3fd7464 Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 10:21:01 -0700 Subject: [PATCH 16/18] Start project without sh file --- .github/workflows/test-php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index a390b290b..70229bb9e 100644 --- a/.github/workflows/test-php.yml +++ b/.github/workflows/test-php.yml @@ -63,7 +63,7 @@ jobs: sed -i -e 's/WP_VERSION=""/WP_VERSION="nightly"/g' tests/codeception.env - name: Start project containers - run: ./bin/test-up.sh + run: docker-compose -f docker-compose.yml up -d - name: Wait for project to be ready run: ./bin/wait-for-it.sh http://localhost:7253 From 1f6d3218883cf58bc5c4a23528de88fb8ce8e87d Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 10:26:08 -0700 Subject: [PATCH 17/18] Update ownership logic --- .github/workflows/test-php.yml | 2 +- bin/test-up.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index 70229bb9e..a390b290b 100644 --- a/.github/workflows/test-php.yml +++ b/.github/workflows/test-php.yml @@ -63,7 +63,7 @@ jobs: sed -i -e 's/WP_VERSION=""/WP_VERSION="nightly"/g' tests/codeception.env - name: Start project containers - run: docker-compose -f docker-compose.yml up -d + run: ./bin/test-up.sh - name: Wait for project to be ready run: ./bin/wait-for-it.sh http://localhost:7253 diff --git a/bin/test-up.sh b/bin/test-up.sh index 216b4f0df..9317b27f3 100755 --- a/bin/test-up.sh +++ b/bin/test-up.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash docker-compose -f docker-compose.yml up -d -docker-compose exec -T wordpress chown www-data:www-data wp-content wp-content/plugins +docker-compose exec -T wordpress chown -R www-data:www-data /var/www/html/wp-content/ From c83d8600ea440974400b854b79b3a4c9934867ae Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Tue, 20 Feb 2024 11:24:02 -0700 Subject: [PATCH 18/18] Get and pass the GitHub Action user to fix docker permissions --- .github/workflows/test-php.yml | 6 +++++- docker-compose.yml | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index a390b290b..b8a7f0680 100644 --- a/.github/workflows/test-php.yml +++ b/.github/workflows/test-php.yml @@ -62,8 +62,12 @@ jobs: run: | sed -i -e 's/WP_VERSION=""/WP_VERSION="nightly"/g' tests/codeception.env + - name: Set UID and GID for docker + run: | + printf 'UID=%d\nGID=%d\n' $(id -u) $(id -g) > .env.ci + - name: Start project containers - run: ./bin/test-up.sh + run: docker compose --env-file .env --env-file .env.ci up -d - name: Wait for project to be ready run: ./bin/wait-for-it.sh http://localhost:7253 diff --git a/docker-compose.yml b/docker-compose.yml index 114a21522..2338f64bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,7 @@ services: restart: always ports: - ${WP_PORT}:80 + user: "${UID:-1000}:${GID:-1000}" environment: WORDPRESS_DB_HOST: db WORDPRESS_DB_NAME: wp