Skip to content

Commit

Permalink
Merge branch 'master' into creame
Browse files Browse the repository at this point in the history
  • Loading branch information
pacotole committed Aug 1, 2023
2 parents 2b443c0 + 7380189 commit 8350cec
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 24 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
@@ -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 "<title>bedrock"
working-directory: bedrock-docker
3 changes: 0 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@
"wordpress-languages": ["es_ES"]
},
"scripts": {
"post-root-package-install": [
"php -r \"copy('.env.example', '.env');\""
],
"test": [
"phpcs"
]
Expand Down
45 changes: 25 additions & 20 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/application.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 8350cec

Please sign in to comment.