Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/roots/bedrock
Browse files Browse the repository at this point in the history
  • Loading branch information
pacotole committed Mar 14, 2024
2 parents 1f76f87 + 2736c86 commit 8b72926
Show file tree
Hide file tree
Showing 6 changed files with 115 additions and 91 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
php-version: ['8.0', '8.1', '8.2']

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -19,9 +19,9 @@ jobs:

- name: Cache Composer dependencies
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
repository: roots/bedrock-docker
ref: main
path: bedrock-docker
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
path: bedrock-docker/bedrock
- name: Build and run
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
web/app/plugins/*
!web/app/plugins/.gitkeep
web/app/mu-plugins/*/
web/app/themes/twentytwentythree/
web/app/themes/twentytwentyfour/
web/app/upgrade
web/app/uploads/*
!web/app/uploads/.gitkeep
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
"oscarotero/env": "^2.1",
"roots/bedrock-autoloader": "^1.0",
"roots/bedrock-disallow-indexing": "^2.0",
"roots/wordpress": "6.3.2",
"roots/wordpress": "6.4.3",
"roots/wp-config": "1.0.0",
"roots/wp-password-bcrypt": "1.1.0",
"wpackagist-theme/twentytwentythree": "^1.0"
"wpackagist-theme/twentytwentyfour": "^1.0"
},
"require-dev": {
"squizlabs/php_codesniffer": "^3.7.1",
Expand Down
Loading

0 comments on commit 8b72926

Please sign in to comment.