From 7ca8123072da3c0d6ad2a29791b2e28e8926b42d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 22:47:52 +0000 Subject: [PATCH 1/8] Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4.1.7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/workflows/test_and_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml index c386fb6d6..ef854ad5e 100644 --- a/.github/workflows/test_and_build.yml +++ b/.github/workflows/test_and_build.yml @@ -185,7 +185,7 @@ jobs: token: ${{ secrets.BOT_TOKEN }} - name: Download built Phar file - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: name: easyengine-phar @@ -238,7 +238,7 @@ jobs: uses: actions/checkout@v3 - name: Download built Phar file - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: name: easyengine-phar From 7c9e8eacea4549ec1d82c5cd23283df9fe97c81a Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Mon, 25 Nov 2024 22:57:44 +0530 Subject: [PATCH 2/8] Update download-artifact to v4 Signed-off-by: Riddhesh Sanghvi --- .github/workflows/test_and_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml index a6cdb097f..9bc2b5703 100644 --- a/.github/workflows/test_and_build.yml +++ b/.github/workflows/test_and_build.yml @@ -187,7 +187,7 @@ jobs: token: ${{ secrets.BOT_TOKEN }} - name: Download built Phar file - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: name: easyengine-phar @@ -240,7 +240,7 @@ jobs: uses: actions/checkout@v3 - name: Download built Phar file - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: name: easyengine-phar From 2a2440492d20913992ac81b4feb59179cb026c13 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Tue, 26 Nov 2024 12:28:19 +0530 Subject: [PATCH 3/8] Update phar build to use 8.3 Signed-off-by: Riddhesh Sanghvi --- .github/workflows/test_and_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml index 9bc2b5703..1866a75ba 100644 --- a/.github/workflows/test_and_build.yml +++ b/.github/workflows/test_and_build.yml @@ -22,7 +22,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.4' + php-version: '8.3' coverage: none tools: composer extensions: pcntl, curl, sqlite3, zip, dom, mbstring, json From 6c9914895b290e98779d24d47bdb40c8edb0ae9c Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Tue, 26 Nov 2024 12:29:15 +0530 Subject: [PATCH 4/8] Add PHP 8.4 for testing EE Signed-off-by: Riddhesh Sanghvi --- .github/workflows/test_and_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml index 1866a75ba..93b9714d7 100644 --- a/.github/workflows/test_and_build.yml +++ b/.github/workflows/test_and_build.yml @@ -92,7 +92,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3'] + php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] steps: - name: Check out source code uses: actions/checkout@v3 From 3377ad2856ff99d9e0ec7efcb3853b98980773ae Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Tue, 26 Nov 2024 14:39:02 +0530 Subject: [PATCH 5/8] Add PHP 8.4 and update stack Signed-off-by: Riddhesh Sanghvi --- img-versions.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/img-versions.json b/img-versions.json index e99f80daf..7a4cadefc 100644 --- a/img-versions.json +++ b/img-versions.json @@ -2,7 +2,7 @@ "easyengine/cron": "v4.7.3", "easyengine/mailhog": "v4.6.5", "easyengine/mariadb": "v4.6.6", - "easyengine/nginx-proxy": "v4.7.6", + "easyengine/nginx-proxy": "v4.8.0", "easyengine/nginx": "v4.7.6", "easyengine/php": "v4.6.6", "easyengine/php5.6": "v4.7.4", @@ -10,11 +10,12 @@ "easyengine/php7.2": "v4.7.4", "easyengine/php7.3": "v4.7.4", "easyengine/php7.4": "v4.7.4", - "easyengine/php8.0": "v4.7.4", - "easyengine/php8.1": "v4.7.5", - "easyengine/php8.2": "v4.7.6", - "easyengine/php8.3": "v4.7.6", - "easyengine/postfix": "v4.7.4", + "easyengine/php8.0": "v4.8.0", + "easyengine/php8.1": "v4.8.0", + "easyengine/php8.2": "v4.8.0", + "easyengine/php8.3": "v4.8.0", + "easyengine/php8.4": "v4.8.0", + "easyengine/postfix": "v4.8.0", "easyengine/redis": "v4.7.6", "easyengine/newrelic-daemon": "v4.7.4" } From 7f5992c3441ba7d6edfbd922735055372f1d165b Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Tue, 26 Nov 2024 14:39:18 +0530 Subject: [PATCH 6/8] Update composer packages for v4.8.0 Signed-off-by: Riddhesh Sanghvi --- composer.json | 6 +++--- composer.lock | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/composer.json b/composer.json index be837dd74..7c0238ea3 100644 --- a/composer.json +++ b/composer.json @@ -39,9 +39,9 @@ "easyengine/mailhog-command": "v1.0.3", "easyengine/service-command": "v1.6.1", "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.2", + "easyengine/site-command": "v3.3.3", + "easyengine/site-type-php": "v1.9.0", + "easyengine/site-type-wp": "v1.9.0", "monolog/monolog": "1.24.0", "mustache/mustache": "2.14.1", "rmccue/requests": "1.8.0", diff --git a/composer.lock b/composer.lock index 22d95aa39..5a96e5e18 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": "a0168e236930fe62a520abf5a41ec6b2", + "content-hash": "b8c6daceccead49d779e0d125186376e", "packages": [ { "name": "acmephp/core", @@ -1161,16 +1161,16 @@ }, { "name": "easyengine/site-command", - "version": "v3.3.2", + "version": "v3.3.3", "source": { "type": "git", "url": "https://github.com/EasyEngine/site-command.git", - "reference": "ee76accecff64a189c54860ab48950151125653b" + "reference": "d930519cc0ad6c9fe81bd17f23692e9f2830feb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyEngine/site-command/zipball/ee76accecff64a189c54860ab48950151125653b", - "reference": "ee76accecff64a189c54860ab48950151125653b", + "url": "https://api.github.com/repos/EasyEngine/site-command/zipball/d930519cc0ad6c9fe81bd17f23692e9f2830feb2", + "reference": "d930519cc0ad6c9fe81bd17f23692e9f2830feb2", "shasum": "" }, "require": { @@ -1231,22 +1231,22 @@ "homepage": "https://github.com/easyengine/site-command", "support": { "issues": "https://github.com/EasyEngine/site-command/issues", - "source": "https://github.com/EasyEngine/site-command/tree/v3.3.2" + "source": "https://github.com/EasyEngine/site-command/tree/v3.3.3" }, - "time": "2024-10-08T14:49:57+00:00" + "time": "2024-11-26T09:06:35+00:00" }, { "name": "easyengine/site-type-php", - "version": "v1.8.1", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/EasyEngine/site-type-php.git", - "reference": "f7ffa594add367df04850bc1b9a46dc857d00c91" + "reference": "7a38595e198650a2091c1497e3ce54c5c5485587" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyEngine/site-type-php/zipball/f7ffa594add367df04850bc1b9a46dc857d00c91", - "reference": "f7ffa594add367df04850bc1b9a46dc857d00c91", + "url": "https://api.github.com/repos/EasyEngine/site-type-php/zipball/7a38595e198650a2091c1497e3ce54c5c5485587", + "reference": "7a38595e198650a2091c1497e3ce54c5c5485587", "shasum": "" }, "require-dev": { @@ -1290,22 +1290,22 @@ "homepage": "https://github.com/easyengine/site-type-php", "support": { "issues": "https://github.com/EasyEngine/site-type-php/issues", - "source": "https://github.com/EasyEngine/site-type-php/tree/v1.8.1" + "source": "https://github.com/EasyEngine/site-type-php/tree/v1.9.0" }, - "time": "2024-10-08T14:52:50+00:00" + "time": "2024-11-26T08:38:27+00:00" }, { "name": "easyengine/site-type-wp", - "version": "v1.8.2", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/EasyEngine/site-type-wp.git", - "reference": "aa429e3777e5c0a37a21fe5d3eab98eb8f625ac7" + "reference": "afcba8ca7429f6a8dc4db608c5acab36921a1193" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EasyEngine/site-type-wp/zipball/aa429e3777e5c0a37a21fe5d3eab98eb8f625ac7", - "reference": "aa429e3777e5c0a37a21fe5d3eab98eb8f625ac7", + "url": "https://api.github.com/repos/EasyEngine/site-type-wp/zipball/afcba8ca7429f6a8dc4db608c5acab36921a1193", + "reference": "afcba8ca7429f6a8dc4db608c5acab36921a1193", "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.2" + "source": "https://github.com/EasyEngine/site-type-wp/tree/v1.9.0" }, - "time": "2024-11-16T07:31:39+00:00" + "time": "2024-11-26T08:38:22+00:00" }, { "name": "guzzlehttp/guzzle", @@ -6217,16 +6217,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.11.0", + "version": "3.11.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "70c08f8d20c0eb4fe56f26644dd94dae76a7f450" + "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/70c08f8d20c0eb4fe56f26644dd94dae76a7f450", - "reference": "70c08f8d20c0eb4fe56f26644dd94dae76a7f450", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/19473c30efe4f7b3cd42522d0b2e6e7f243c6f87", + "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87", "shasum": "" }, "require": { @@ -6293,7 +6293,7 @@ "type": "open_collective" } ], - "time": "2024-11-12T09:53:29+00:00" + "time": "2024-11-16T12:02:36+00:00" }, { "name": "theseer/tokenizer", From 6abd6188d0e0cbe2c2ce0f84067626155bbf7935 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Tue, 26 Nov 2024 14:39:32 +0530 Subject: [PATCH 7/8] Bump to version v4.8.0 Signed-off-by: Riddhesh Sanghvi --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 546080495..88f181192 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.7.6 +4.8.0 From a737264508f45273f6ece82e6b9b5082a5308d88 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Tue, 26 Nov 2024 14:43:41 +0530 Subject: [PATCH 8/8] Update upload artifact to v4 Signed-off-by: Riddhesh Sanghvi --- .github/workflows/test_and_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml index 9bc2b5703..86533d83b 100644 --- a/.github/workflows/test_and_build.yml +++ b/.github/workflows/test_and_build.yml @@ -68,7 +68,7 @@ jobs: - name: Upload EE version - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cli_version path: VERSION @@ -80,7 +80,7 @@ jobs: run: sudo ./easyengine.phar cli info - name: Upload built Phar file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: easyengine-phar path: easyengine.phar