Skip to content

Commit 909980c

Browse files
committed
Merge branch '3.x' into 4.x
2 parents fd368b8 + 1a3cea4 commit 909980c

File tree

6 files changed

+388
-125
lines changed

6 files changed

+388
-125
lines changed

.github/workflows/deploy-docs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
DOCS_VERSION: v3
4848

4949
- name: Upload v3 artifact
50-
uses: actions/upload-artifact@v4
50+
uses: actions/upload-artifact@v6
5151
with:
5252
name: docs-v3
5353
path: ./docs/.output/public
@@ -81,7 +81,7 @@ jobs:
8181
DOCS_VERSION: v2
8282

8383
- name: Upload v2 artifact
84-
uses: actions/upload-artifact@v4
84+
uses: actions/upload-artifact@v6
8585
with:
8686
name: docs-v2
8787
path: ./docs/.output/public
@@ -98,13 +98,13 @@ jobs:
9898
uses: actions/configure-pages@v5
9999

100100
- name: Download v3 artifact
101-
uses: actions/download-artifact@v4
101+
uses: actions/download-artifact@v7
102102
with:
103103
name: docs-v3
104104
path: ./combined
105105

106106
- name: Download v2 artifact
107-
uses: actions/download-artifact@v4
107+
uses: actions/download-artifact@v7
108108
with:
109109
name: docs-v2
110110
path: ./combined/v2

0 commit comments

Comments
 (0)