Skip to content

Commit 00583cb

Browse files
Merge 1.23.2
2 parents 80249a7 + f1ceb15 commit 00583cb

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
php-version: ['8.0', '8.1', '8.2']
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414

1515
- name: Setup PHP
1616
uses: shivammathur/setup-php@v2
@@ -21,7 +21,7 @@ jobs:
2121
id: composer-cache
2222
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
2323

24-
- uses: actions/cache@v2
24+
- uses: actions/cache@v4
2525
with:
2626
path: ${{ steps.composer-cache.outputs.dir }}
2727
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/integration.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v2
9+
- uses: actions/checkout@v4
1010
with:
1111
repository: roots/bedrock-docker
1212
ref: main
1313
path: bedrock-docker
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
with:
1616
path: bedrock-docker/bedrock
1717
- name: Build and run

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
web/app/plugins/*
33
!web/app/plugins/.gitkeep
44
web/app/mu-plugins/*/
5-
web/app/themes/twentytwentyfour/
5+
web/app/themes/*/
66
web/app/upgrade
77
web/app/uploads/*
88
!web/app/uploads/.gitkeep

composer.json

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
"roots/wp-config": "^1.0.0",
6666
"roots/wp-password-bcrypt": "^1.1.0",
6767
"wpackagist-theme/twentytwentyfour": "^1.0",
68+
"wpackagist-theme/frost": "^1.0",
6869
"sterner-stuff/made-of-sterner-stuff": "^11.0",
6970
"kinsta/kinsta-mu-plugins": "dev-sterner-stuff",
7071
"wpackagist-plugin/mailgun": ">=1.9",

0 commit comments

Comments
 (0)