Skip to content

Commit bc96443

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/production-3ca5113933
2 parents 2c8c60d + 546a32c commit bc96443

File tree

7 files changed

+1478
-1246
lines changed

7 files changed

+1478
-1246
lines changed

.github/workflows/beta-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v4
2020
- name: Setup node
21-
uses: actions/setup-node@v4
21+
uses: actions/setup-node@v6
2222
with:
2323
cache: yarn
2424
node-version: ${{ matrix.node }}
@@ -35,7 +35,7 @@ jobs:
3535
steps:
3636
- uses: actions/checkout@v4
3737
- name: Setup node
38-
uses: actions/setup-node@v4
38+
uses: actions/setup-node@v6
3939
with:
4040
cache: yarn
4141
node-version: ${{ matrix.node }}
@@ -49,7 +49,7 @@ jobs:
4949
steps:
5050
- uses: actions/checkout@v4
5151
- name: Setup node
52-
uses: actions/setup-node@v4
52+
uses: actions/setup-node@v6
5353
with:
5454
cache: yarn
5555
node-version: ${{ matrix.node }}

.github/workflows/cypress.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Checkout
2222
uses: actions/checkout@v4
2323
- name: Setup node
24-
uses: actions/setup-node@v4
24+
uses: actions/setup-node@v6
2525
with:
2626
node-version: '20.x'
2727
cache: yarn

.github/workflows/pre-release-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v4
2020
- name: Setup node
21-
uses: actions/setup-node@v4
21+
uses: actions/setup-node@v6
2222
with:
2323
cache: yarn
2424
node-version: ${{ matrix.node }}
@@ -35,7 +35,7 @@ jobs:
3535
steps:
3636
- uses: actions/checkout@v4
3737
- name: Setup node
38-
uses: actions/setup-node@v4
38+
uses: actions/setup-node@v6
3939
with:
4040
cache: yarn
4141
node-version: ${{ matrix.node }}
@@ -49,7 +49,7 @@ jobs:
4949
steps:
5050
- uses: actions/checkout@v4
5151
- name: Setup node
52-
uses: actions/setup-node@v4
52+
uses: actions/setup-node@v6
5353
with:
5454
cache: yarn
5555
node-version: ${{ matrix.node }}

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v4
11-
- uses: actions/setup-node@v4
11+
- uses: actions/setup-node@v6
1212
with:
1313
node-version: 20
1414
registry-url: https://registry.npmjs.org/

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v4
2424
- name: Setup node
25-
uses: actions/setup-node@v4
25+
uses: actions/setup-node@v6
2626
with:
2727
node-version: ${{ matrix.node }}
2828
- name: Cache dependencies
@@ -44,7 +44,7 @@ jobs:
4444
steps:
4545
- uses: actions/checkout@v4
4646
- name: Setup node
47-
uses: actions/setup-node@v4
47+
uses: actions/setup-node@v6
4848
with:
4949
node-version: ${{ matrix.node }}
5050
- name: Cache dependencies
@@ -69,7 +69,7 @@ jobs:
6969
steps:
7070
- uses: actions/checkout@v4
7171
- name: Setup node
72-
uses: actions/setup-node@v4
72+
uses: actions/setup-node@v6
7373
with:
7474
node-version: '18.x'
7575
- name: Cache dependencies

playground/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"strapi": "strapi"
1111
},
1212
"dependencies": {
13-
"@strapi/plugin-users-permissions": "5.9.0",
14-
"@strapi/strapi": "5.9.0",
13+
"@strapi/plugin-users-permissions": "5.30.0",
14+
"@strapi/strapi": "5.30.0",
1515
"better-sqlite3": "9.4.3",
1616
"fs-extra": "^10.0.0",
17-
"meilisearch": "0.48.2",
17+
"meilisearch": "0.54.0",
1818
"mime-types": "^2.1.27",
1919
"react": "^18.0.0",
2020
"react-dom": "^18.0.0",

0 commit comments

Comments
 (0)