From 8f1f2f87b7b20298aebe9181c6b0bd3ba1b58e64 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Tue, 8 Oct 2024 21:52:10 +0530 Subject: [PATCH 1/5] Bump composer/composer from 2.2.23 to 2.2.24 Signed-off-by: Riddhesh Sanghvi --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 1630a9ae9..1fbd753c6 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "prefer-stable": true, "require": { "php": ">=7.0", - "composer/composer": "2.2.23", + "composer/composer": "2.2.24", "composer/semver": "3.2.4", "daverandom/libdns": "^2.0", "easyengine/admin-tools-command": "v1.1.0", diff --git a/composer.lock b/composer.lock index 713b8d246..f77468228 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": "5498938c77cc0c6c755fb80e2c8f4870", + "content-hash": "ce2e2a2e7458b61ca39039d4420bc51d", "packages": [ { "name": "acmephp/core", @@ -275,16 +275,16 @@ }, { "name": "composer/composer", - "version": "2.2.23", + "version": "2.2.24", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "d1542e89636abf422fde328cb28d53752efb69e5" + "reference": "91d9d38ebc274267f952ee1fd3892dc7962075f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/d1542e89636abf422fde328cb28d53752efb69e5", - "reference": "d1542e89636abf422fde328cb28d53752efb69e5", + "url": "https://api.github.com/repos/composer/composer/zipball/91d9d38ebc274267f952ee1fd3892dc7962075f4", + "reference": "91d9d38ebc274267f952ee1fd3892dc7962075f4", "shasum": "" }, "require": { @@ -354,7 +354,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.2.23" + "source": "https://github.com/composer/composer/tree/2.2.24" }, "funding": [ { @@ -370,7 +370,7 @@ "type": "tidelift" } ], - "time": "2024-02-08T14:08:53+00:00" + "time": "2024-06-10T20:51:52+00:00" }, { "name": "composer/metadata-minifier", From 96eeff848d49f7d63586d1881f7d850be6df2184 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 14 Oct 2024 17:47:15 +0530 Subject: [PATCH 2/5] Update phar on tag Signed-off-by: Riddhesh Sanghvi --- .github/workflows/test_and_build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml index c386fb6d6..2868a7e50 100644 --- a/.github/workflows/test_and_build.yml +++ b/.github/workflows/test_and_build.yml @@ -172,8 +172,10 @@ jobs: deploy: #----------------------------------------------------------------------- name: Deploy Phar if: | - github.repository_owner == 'EasyEngine' && - (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master') + github.repository_owner == 'EasyEngine' && ( + startsWith(github.ref, 'refs/tags/') || + github.ref == 'refs/heads/develop' + ) runs-on: ubuntu-latest needs: [build, test] @@ -193,8 +195,8 @@ jobs: if: ${{ contains(github.ref, 'develop') }} run: | echo 'FILENAME=easyengine-nightly.phar' > $GITHUB_ENV - - name: Set file name for master branch - if: ${{ contains(github.ref, 'master') }} + - name: Set file name for tag + if: ${{ contains(github.ref, 'refs/tags') }} run: | echo 'FILENAME=easyengine.phar' > $GITHUB_ENV From 91dc0e5e0cfb37d960a0c184fc3a52221ce7bef7 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 14 Oct 2024 17:49:12 +0530 Subject: [PATCH 3/5] Fix update log typo Signed-off-by: Riddhesh Sanghvi --- php/EE/Migration/SiteContainers.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php/EE/Migration/SiteContainers.php b/php/EE/Migration/SiteContainers.php index 2d670bd45..f2b7e0e31 100644 --- a/php/EE/Migration/SiteContainers.php +++ b/php/EE/Migration/SiteContainers.php @@ -101,9 +101,9 @@ public static function is_site_service_image_changed( $updated_images, $site_inf */ public static function generate_site_docker_compose_file( $site_info, $site_object ) { $site_object->populate_site_info( $site_info['site_url'] ); - EE::debug( "Start generating news docker-compose.yml for ${site_info['site_url']}" ); + EE::debug( "Start generating new docker-compose.yml for ${site_info['site_url']}" ); $site_object->dump_docker_compose_yml( [ 'nohttps' => ! $site_info['site_ssl'] ] ); - EE::debug( "Complete generating news docker-compose.yml for ${site_info['site_url']}" ); + EE::debug( "Complete generating new docker-compose.yml for ${site_info['site_url']}" ); } /** From a679bcade4638ca53c38d70e4c443ed005152241 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Sat, 16 Nov 2024 13:05:22 +0530 Subject: [PATCH 4/5] Update composer packages for v4.7.6 Signed-off-by: Riddhesh Sanghvi --- composer.json | 4 +-- composer.lock | 88 +++++++++++++++++++++++++-------------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/composer.json b/composer.json index 1fbd753c6..be837dd74 100644 --- a/composer.json +++ b/composer.json @@ -38,10 +38,10 @@ "easyengine/log-command": "v1.1.0", "easyengine/mailhog-command": "v1.0.3", "easyengine/service-command": "v1.6.1", - "easyengine/shell-command": "v1.1.2", + "easyengine/shell-command": "v1.1.3", "easyengine/site-command": "v3.3.2", "easyengine/site-type-php": "v1.8.1", - "easyengine/site-type-wp": "v1.8.1", + "easyengine/site-type-wp": "v1.8.2", "monolog/monolog": "1.24.0", "mustache/mustache": "2.14.1", "rmccue/requests": "1.8.0", diff --git a/composer.lock b/composer.lock index f77468228..22d95aa39 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": "ce2e2a2e7458b61ca39039d4420bc51d", + "content-hash": "a0168e236930fe62a520abf5a41ec6b2", "packages": [ { "name": "acmephp/core", @@ -199,16 +199,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.5.2", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "48a792895a2b7a6ee65dd5442c299d7b835b6137" + "reference": "3b1fc3f0be055baa7c6258b1467849c3e8204eb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/48a792895a2b7a6ee65dd5442c299d7b835b6137", - "reference": "48a792895a2b7a6ee65dd5442c299d7b835b6137", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/3b1fc3f0be055baa7c6258b1467849c3e8204eb2", + "reference": "3b1fc3f0be055baa7c6258b1467849c3e8204eb2", "shasum": "" }, "require": { @@ -255,7 +255,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.5.2" + "source": "https://github.com/composer/ca-bundle/tree/1.5.3" }, "funding": [ { @@ -271,7 +271,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T07:49:53+00:00" + "time": "2024-11-04T10:15:26+00:00" }, { "name": "composer/composer", @@ -1117,16 +1117,16 @@ }, { "name": "easyengine/shell-command", - "version": "v1.1.2", + "version": "v1.1.3", "source": { "type": "git", "url": "https://github.com/EasyEngine/shell-command.git", - "reference": "e7676ed2939435354c2c176489e6ba1628561f49" + "reference": "e16751f54ae98ac2d43d54add02fa8befd568f9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyEngine/shell-command/zipball/e7676ed2939435354c2c176489e6ba1628561f49", - "reference": "e7676ed2939435354c2c176489e6ba1628561f49", + "url": "https://api.github.com/repos/EasyEngine/shell-command/zipball/e16751f54ae98ac2d43d54add02fa8befd568f9c", + "reference": "e16751f54ae98ac2d43d54add02fa8befd568f9c", "shasum": "" }, "type": "ee-cli-package", @@ -1155,9 +1155,9 @@ "homepage": "https://github.com/easyengine/shell-command", "support": { "issues": "https://github.com/EasyEngine/shell-command/issues", - "source": "https://github.com/EasyEngine/shell-command/tree/v1.1.2" + "source": "https://github.com/EasyEngine/shell-command/tree/v1.1.3" }, - "time": "2024-10-08T14:45:56+00:00" + "time": "2024-11-16T07:30:59+00:00" }, { "name": "easyengine/site-command", @@ -1296,16 +1296,16 @@ }, { "name": "easyengine/site-type-wp", - "version": "v1.8.1", + "version": "v1.8.2", "source": { "type": "git", "url": "https://github.com/EasyEngine/site-type-wp.git", - "reference": "9a38a3ee9d62dd4988f28ab3fd4d1b8bbbbb0218" + "reference": "aa429e3777e5c0a37a21fe5d3eab98eb8f625ac7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyEngine/site-type-wp/zipball/9a38a3ee9d62dd4988f28ab3fd4d1b8bbbbb0218", - "reference": "9a38a3ee9d62dd4988f28ab3fd4d1b8bbbbb0218", + "url": "https://api.github.com/repos/EasyEngine/site-type-wp/zipball/aa429e3777e5c0a37a21fe5d3eab98eb8f625ac7", + "reference": "aa429e3777e5c0a37a21fe5d3eab98eb8f625ac7", "shasum": "" }, "require-dev": { @@ -1349,9 +1349,9 @@ "homepage": "https://github.com/easyengine/site-type-wp", "support": { "issues": "https://github.com/EasyEngine/site-type-wp/issues", - "source": "https://github.com/EasyEngine/site-type-wp/tree/v1.8.1" + "source": "https://github.com/EasyEngine/site-type-wp/tree/v1.8.2" }, - "time": "2024-10-08T14:53:03+00:00" + "time": "2024-11-16T07:31:39+00:00" }, { "name": "guzzlehttp/guzzle", @@ -1481,16 +1481,16 @@ }, { "name": "guzzlehttp/promises", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8" + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", - "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", + "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455", + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455", "shasum": "" }, "require": { @@ -1544,7 +1544,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.3" + "source": "https://github.com/guzzle/promises/tree/2.0.4" }, "funding": [ { @@ -1560,7 +1560,7 @@ "type": "tidelift" } ], - "time": "2024-07-18T10:29:17+00:00" + "time": "2024-10-17T10:06:22+00:00" }, { "name": "guzzlehttp/psr7", @@ -4290,25 +4290,25 @@ }, { "name": "behat/gherkin", - "version": "v4.9.0", + "version": "v4.10.0", "source": { "type": "git", "url": "https://github.com/Behat/Gherkin.git", - "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4" + "reference": "cbb83c4c435dd8d05a161f2a5ae322e61b2f4db6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Gherkin/zipball/0bc8d1e30e96183e4f36db9dc79caead300beff4", - "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/cbb83c4c435dd8d05a161f2a5ae322e61b2f4db6", + "reference": "cbb83c4c435dd8d05a161f2a5ae322e61b2f4db6", "shasum": "" }, "require": { "php": "~7.2|~8.0" }, "require-dev": { - "cucumber/cucumber": "dev-gherkin-22.0.0", + "cucumber/cucumber": "dev-gherkin-24.1.0", "phpunit/phpunit": "~8|~9", - "symfony/yaml": "~3|~4|~5" + "symfony/yaml": "~3|~4|~5|~6|~7" }, "suggest": { "symfony/yaml": "If you want to parse features, represented in YAML files" @@ -4347,9 +4347,9 @@ ], "support": { "issues": "https://github.com/Behat/Gherkin/issues", - "source": "https://github.com/Behat/Gherkin/tree/v4.9.0" + "source": "https://github.com/Behat/Gherkin/tree/v4.10.0" }, - "time": "2021-10-12T13:05:09+00:00" + "time": "2024-10-19T14:46:06+00:00" }, { "name": "behat/transliterator", @@ -4542,16 +4542,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.12.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", "shasum": "" }, "require": { @@ -4590,7 +4590,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" }, "funding": [ { @@ -4598,7 +4598,7 @@ "type": "tidelift" } ], - "time": "2024-06-12T14:39:25+00:00" + "time": "2024-11-08T17:47:46+00:00" }, { "name": "nikic/php-parser", @@ -6217,16 +6217,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.3", + "version": "3.11.0", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" + "reference": "70c08f8d20c0eb4fe56f26644dd94dae76a7f450" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c", - "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/70c08f8d20c0eb4fe56f26644dd94dae76a7f450", + "reference": "70c08f8d20c0eb4fe56f26644dd94dae76a7f450", "shasum": "" }, "require": { @@ -6293,7 +6293,7 @@ "type": "open_collective" } ], - "time": "2024-09-18T10:38:58+00:00" + "time": "2024-11-12T09:53:29+00:00" }, { "name": "theseer/tokenizer", From 0543f29bd22a3c6da6b03525080e28b7340662ed Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Sat, 16 Nov 2024 13:05:36 +0530 Subject: [PATCH 5/5] Update images for v4.7.6 Signed-off-by: Riddhesh Sanghvi --- img-versions.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/img-versions.json b/img-versions.json index 1f67b99fd..e99f80daf 100644 --- a/img-versions.json +++ b/img-versions.json @@ -2,8 +2,8 @@ "easyengine/cron": "v4.7.3", "easyengine/mailhog": "v4.6.5", "easyengine/mariadb": "v4.6.6", - "easyengine/nginx-proxy": "v4.7.5", - "easyengine/nginx": "v4.7.5", + "easyengine/nginx-proxy": "v4.7.6", + "easyengine/nginx": "v4.7.6", "easyengine/php": "v4.6.6", "easyengine/php5.6": "v4.7.4", "easyengine/php7.0": "v4.7.4", @@ -12,9 +12,9 @@ "easyengine/php7.4": "v4.7.4", "easyengine/php8.0": "v4.7.4", "easyengine/php8.1": "v4.7.5", - "easyengine/php8.2": "v4.7.5", - "easyengine/php8.3": "v4.7.5", + "easyengine/php8.2": "v4.7.6", + "easyengine/php8.3": "v4.7.6", "easyengine/postfix": "v4.7.4", - "easyengine/redis": "v4.7.3", + "easyengine/redis": "v4.7.6", "easyengine/newrelic-daemon": "v4.7.4" }