Merge 1.23.2

sterner-stuff · Mar 25, 2024 · 00583cb · 00583cb
2 parents 80249a7 + f1ceb15
commit 00583cb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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
@@ -21,7 +21,7 @@ jobs:
       id: composer-cache
       run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -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

diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@
 web/app/plugins/*
 !web/app/plugins/.gitkeep
 web/app/mu-plugins/*/
-web/app/themes/twentytwentyfour/
+web/app/themes/*/
 web/app/upgrade
 web/app/uploads/*
 !web/app/uploads/.gitkeep

diff --git a/composer.json b/composer.json
@@ -65,6 +65,7 @@
     "roots/wp-config": "^1.0.0",
     "roots/wp-password-bcrypt": "^1.1.0",
     "wpackagist-theme/twentytwentyfour": "^1.0",
+    "wpackagist-theme/frost": "^1.0",
     "sterner-stuff/made-of-sterner-stuff": "^11.0",
     "kinsta/kinsta-mu-plugins": "dev-sterner-stuff",
     "wpackagist-plugin/mailgun": ">=1.9",