From 5993b4eddb8a72ac70c25656031cc804e3c5dc24 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 May 2023 15:40:25 -0500 Subject: [PATCH 1/5] =?UTF-8?q?fix(deps):=20=E2=AC=86=EF=B8=8F=20bump=20ro?= =?UTF-8?q?ots/wordpress=20to=20v6.2.1=20(#676)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index ec156cbb52..5b59e7029a 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "oscarotero/env": "^2.1", "roots/bedrock-autoloader": "^1.0", "roots/bedrock-disallow-indexing": "^2.0", - "roots/wordpress": "6.2", + "roots/wordpress": "6.2.1", "roots/wp-config": "1.0.0", "roots/wp-password-bcrypt": "1.1.0", "wpackagist-theme/twentytwentythree": "^1.0" diff --git a/composer.lock b/composer.lock index d3b281b69b..34612242cc 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": "4b4236dfbfdd429df76edfc02cc7e26f", + "content-hash": "36f267908a09b42a810266ecd6dade1d", "packages": [ { "name": "composer/installers", @@ -464,7 +464,7 @@ }, { "name": "roots/wordpress", - "version": "6.2", + "version": "6.2.1", "source": { "type": "git", "url": "https://github.com/roots/wordpress.git", @@ -495,7 +495,7 @@ ], "support": { "issues": "https://github.com/roots/wordpress/issues", - "source": "https://github.com/roots/wordpress/tree/6.2" + "source": "https://github.com/roots/wordpress/tree/6.2.1" }, "funding": [ { @@ -578,22 +578,22 @@ }, { "name": "roots/wordpress-no-content", - "version": "6.2", + "version": "6.2.1", "source": { "type": "git", "url": "https://github.com/WordPress/WordPress.git", - "reference": "6.2" + "reference": "6.2.1" }, "dist": { "type": "zip", - "url": "https://downloads.wordpress.org/release/wordpress-6.2-no-content.zip", - "shasum": "f584c96734b9b7d3f770dbc176740cf92e54aa6c" + "url": "https://downloads.wordpress.org/release/wordpress-6.2.1-no-content.zip", + "shasum": "9a911295a2572239dd1de02d6b537588a3666536" }, "require": { "php": ">= 5.6.20" }, "provide": { - "wordpress/core-implementation": "6.2" + "wordpress/core-implementation": "6.2.1" }, "suggest": { "ext-curl": "Performs remote request operations.", @@ -644,7 +644,7 @@ "type": "other" } ], - "time": "2023-03-29T18:03:09+00:00" + "time": "2023-05-16T16:51:43+00:00" }, { "name": "roots/wp-config", From 8bc7fb4a940f9935b99c8b5aa008f4f3252a8893 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 May 2023 10:16:24 -0500 Subject: [PATCH 2/5] =?UTF-8?q?fix(deps):=20=E2=AC=86=EF=B8=8F=20bump=20ro?= =?UTF-8?q?ots/wordpress=20to=20v6.2.2=20(#677)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 5b59e7029a..7bbcb13c80 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "oscarotero/env": "^2.1", "roots/bedrock-autoloader": "^1.0", "roots/bedrock-disallow-indexing": "^2.0", - "roots/wordpress": "6.2.1", + "roots/wordpress": "6.2.2", "roots/wp-config": "1.0.0", "roots/wp-password-bcrypt": "1.1.0", "wpackagist-theme/twentytwentythree": "^1.0" diff --git a/composer.lock b/composer.lock index 34612242cc..d976411f47 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": "36f267908a09b42a810266ecd6dade1d", + "content-hash": "8cb223ac0d1d1ba5189cb2ff2dc29e9b", "packages": [ { "name": "composer/installers", @@ -464,7 +464,7 @@ }, { "name": "roots/wordpress", - "version": "6.2.1", + "version": "6.2.2", "source": { "type": "git", "url": "https://github.com/roots/wordpress.git", @@ -495,7 +495,7 @@ ], "support": { "issues": "https://github.com/roots/wordpress/issues", - "source": "https://github.com/roots/wordpress/tree/6.2.1" + "source": "https://github.com/roots/wordpress/tree/6.2.2" }, "funding": [ { @@ -578,22 +578,22 @@ }, { "name": "roots/wordpress-no-content", - "version": "6.2.1", + "version": "6.2.2", "source": { "type": "git", "url": "https://github.com/WordPress/WordPress.git", - "reference": "6.2.1" + "reference": "6.2.2" }, "dist": { "type": "zip", - "url": "https://downloads.wordpress.org/release/wordpress-6.2.1-no-content.zip", - "shasum": "9a911295a2572239dd1de02d6b537588a3666536" + "url": "https://downloads.wordpress.org/release/wordpress-6.2.2-no-content.zip", + "shasum": "df066a16e97dd6ad5c1679d4a575983ea3143117" }, "require": { "php": ">= 5.6.20" }, "provide": { - "wordpress/core-implementation": "6.2.1" + "wordpress/core-implementation": "6.2.2" }, "suggest": { "ext-curl": "Performs remote request operations.", @@ -644,7 +644,7 @@ "type": "other" } ], - "time": "2023-05-16T16:51:43+00:00" + "time": "2023-05-20T04:31:46+00:00" }, { "name": "roots/wp-config", From 052bf9d60b08a5f00273f6846999709e900eed27 Mon Sep 17 00:00:00 2001 From: Scott Walkinshaw Date: Tue, 6 Jun 2023 08:48:46 -0400 Subject: [PATCH 3/5] Add integration test workflow (#678) --- .github/workflows/integration.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/integration.yml diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml new file mode 100644 index 0000000000..6fbcbf2297 --- /dev/null +++ b/.github/workflows/integration.yml @@ -0,0 +1,25 @@ +name: Integration + +on: [push, pull_request, workflow_dispatch] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + repository: roots/bedrock-docker + ref: main + path: bedrock-docker + - uses: actions/checkout@v2 + with: + path: bedrock-docker/bedrock + - name: Build and run + run: docker compose up --build -d + working-directory: bedrock-docker + - name: Wait for install + run: sleep 30 + working-directory: bedrock-docker + - name: Verify install + run: curl -s http://127.0.0.1 | grep "bedrock" + working-directory: bedrock-docker From 9223c3b2236e9594a8136bfda93db4dfd7574717 Mon Sep 17 00:00:00 2001 From: Dareth NHANG <DSGND@users.noreply.github.com> Date: Tue, 13 Jun 2023 20:04:50 +0200 Subject: [PATCH 4/5] Support `local` as `WP_ENVIRONMENT_TYPE` (#681) --- config/application.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/application.php b/config/application.php index 5daa7ff156..99c8ba2bf3 100644 --- a/config/application.php +++ b/config/application.php @@ -53,7 +53,7 @@ /** * Infer WP_ENVIRONMENT_TYPE based on WP_ENV */ -if (!env('WP_ENVIRONMENT_TYPE') && in_array(WP_ENV, ['production', 'staging', 'development'])) { +if (!env('WP_ENVIRONMENT_TYPE') && in_array(WP_ENV, ['production', 'staging', 'development', 'local'])) { Config::define('WP_ENVIRONMENT_TYPE', WP_ENV); } From 50a86d4f03aa0b9c1683ef22ac32e0cc7929a629 Mon Sep 17 00:00:00 2001 From: Scott Walkinshaw <scott.walkinshaw@gmail.com> Date: Sat, 15 Jul 2023 20:32:00 -0400 Subject: [PATCH 5/5] Remove post install .env copy (#595) `.env.example` is just an example and doesn't contain useful defaults. Copying this file can be confusing since it needs to be edited regardless. By not copying this file, we'll surface errors of missing config values sooner since they'll be no default values. --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index 7bbcb13c80..9e76ade7f4 100644 --- a/composer.json +++ b/composer.json @@ -65,9 +65,6 @@ "wordpress-install-dir": "web/wp" }, "scripts": { - "post-root-package-install": [ - "php -r \"copy('.env.example', '.env');\"" - ], "test": [ "phpcs" ]