Skip to content

Commit 829982a

Browse files
TomNewChaoTomNewChao
authored
Merge branch 'ether:develop' into develop
2 parents d986347 + 8569082 commit 829982a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+16510
-15569
lines changed

‎.github/workflows/backend-tests.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
node: [18, 20, 21]
27+
node: [18, 20, 22]
2828
steps:
2929
-
3030
name: Checkout repository
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/setup-node@v4
3434
with:
3535
node-version: ${{ matrix.node }}
36-
- uses: pnpm/action-setup@v3
36+
- uses: pnpm/action-setup@v4
3737
name: Install pnpm
3838
with:
3939
version: 9.0.4
@@ -81,7 +81,7 @@ jobs:
8181
strategy:
8282
fail-fast: false
8383
matrix:
84-
node: [18, 20, 21]
84+
node: [18, 20, 22]
8585
steps:
8686
-
8787
name: Checkout repository
@@ -90,7 +90,7 @@ jobs:
9090
uses: actions/setup-node@v4
9191
with:
9292
node-version: ${{ matrix.node }}
93-
- uses: pnpm/action-setup@v3
93+
- uses: pnpm/action-setup@v4
9494
name: Install pnpm
9595
with:
9696
version: 9.0.4
@@ -133,7 +133,6 @@ jobs:
133133
ep_font_size
134134
ep_hash_auth
135135
ep_headings2
136-
ep_image_upload
137136
ep_markdown
138137
ep_readonly_guest
139138
ep_set_title_on_pad
@@ -160,7 +159,7 @@ jobs:
160159
uses: actions/setup-node@v4
161160
with:
162161
node-version: 20
163-
- uses: pnpm/action-setup@v3
162+
- uses: pnpm/action-setup@v4
164163
name: Install pnpm
165164
with:
166165
version: 9.0.4
@@ -212,8 +211,8 @@ jobs:
212211
-
213212
uses: actions/setup-node@v4
214213
with:
215-
node-version: 21
216-
- uses: pnpm/action-setup@v3
214+
node-version: 22
215+
- uses: pnpm/action-setup@v4
217216
name: Install pnpm
218217
with:
219218
version: 9.0.4
@@ -249,7 +248,6 @@ jobs:
249248
ep_font_size
250249
ep_hash_auth
251250
ep_headings2
252-
ep_image_upload
253251
ep_markdown
254252
ep_readonly_guest
255253
ep_set_title_on_pad

‎.github/workflows/build-and-deploy-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/checkout@v4
3636
- name: Setup Pages
3737
uses: actions/configure-pages@v5
38-
- uses: pnpm/action-setup@v3
38+
- uses: pnpm/action-setup@v4
3939
name: Install pnpm
4040
with:
4141
version: 9.0.4

‎.github/workflows/docker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: docker/setup-buildx-action@v3
3232
-
3333
name: Build and export to Docker
34-
uses: docker/build-push-action@v5
34+
uses: docker/build-push-action@v6
3535
with:
3636
context: .
3737
target: production
@@ -44,7 +44,7 @@ jobs:
4444
uses: actions/setup-node@v4
4545
with:
4646
node-version: 'lts/*'
47-
- uses: pnpm/action-setup@v3
47+
- uses: pnpm/action-setup@v4
4848
name: Install pnpm
4949
with:
5050
version: 9.0.4
@@ -99,7 +99,7 @@ jobs:
9999
-
100100
name: Build and push
101101
if: github.event_name == 'push'
102-
uses: docker/build-push-action@v5
102+
uses: docker/build-push-action@v6
103103
with:
104104
context: .
105105
target: production

‎.github/workflows/frontend-admin-tests.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ permissions:
1111

1212
jobs:
1313
withplugins:
14-
if: ${{ github.actor != 'dependabot[bot]' }}
1514
name: with plugins
1615
runs-on: ubuntu-latest
1716

1817
strategy:
1918
fail-fast: false
2019
matrix:
21-
node: [20, 21]
20+
node: [20, 22]
2221

2322
steps:
2423
-
@@ -34,7 +33,7 @@ jobs:
3433
uses: actions/setup-node@v4
3534
with:
3635
node-version: ${{ matrix.node }}
37-
- uses: pnpm/action-setup@v3
36+
- uses: pnpm/action-setup@v4
3837
name: Install pnpm
3938
with:
4039
version: 9.0.4
@@ -85,7 +84,7 @@ jobs:
8584
run: "sed -i 's/\"enableAdminUITests\": false/\"enableAdminUITests\": true,\\n\"users\":{\"admin\":{\"password\":\"changeme1\",\"is_admin\":true}}/' settings.json"
8685
-
8786
name: increase maxHttpBufferSize
88-
run: "sed -i 's/\"maxHttpBufferSize\": 10000/\"maxHttpBufferSize\": 10000000/' settings.json"
87+
run: "sed -i 's/\"maxHttpBufferSize\": 50000/\"maxHttpBufferSize\": 10000000/' settings.json"
8988
-
9089
name: Disable import/export rate limiting
9190
run: |

‎.github/workflows/frontend-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
-
2727
uses: actions/setup-node@v4
2828
with:
29-
node-version: 21
30-
- uses: pnpm/action-setup@v3
29+
node-version: 22
30+
- uses: pnpm/action-setup@v4
3131
name: Install pnpm
3232
with:
3333
version: 9.0.4
@@ -92,8 +92,8 @@ jobs:
9292
uses: actions/checkout@v4
9393
- uses: actions/setup-node@v4
9494
with:
95-
node-version: 21
96-
- uses: pnpm/action-setup@v3
95+
node-version: 22
96+
- uses: pnpm/action-setup@v4
9797
name: Install pnpm
9898
with:
9999
version: 9.0.4
@@ -159,8 +159,8 @@ jobs:
159159
-
160160
uses: actions/setup-node@v4
161161
with:
162-
node-version: 21
163-
- uses: pnpm/action-setup@v3
162+
node-version: 22
163+
- uses: pnpm/action-setup@v4
164164
name: Install pnpm
165165
with:
166166
version: 9.0.4

‎.github/workflows/load-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/setup-node@v4
3030
with:
3131
node-version: 20
32-
- uses: pnpm/action-setup@v3
32+
- uses: pnpm/action-setup@v4
3333
name: Install pnpm
3434
with:
3535
version: 9.0.4
@@ -73,7 +73,7 @@ jobs:
7373
uses: actions/setup-node@v4
7474
with:
7575
node-version: 20
76-
- uses: pnpm/action-setup@v3
76+
- uses: pnpm/action-setup@v4
7777
name: Install pnpm
7878
with:
7979
version: 9.0.4
@@ -144,7 +144,7 @@ jobs:
144144
uses: actions/setup-node@v4
145145
with:
146146
node-version: 20
147-
- uses: pnpm/action-setup@v3
147+
- uses: pnpm/action-setup@v4
148148
name: Install pnpm
149149
with:
150150
version: 9.0.4

‎.github/workflows/perform-type-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- uses: actions/setup-node@v4
2727
with:
2828
node-version: 20
29-
- uses: pnpm/action-setup@v3
29+
- uses: pnpm/action-setup@v4
3030
name: Install pnpm
3131
with:
3232
version: 9.0.4

‎.github/workflows/rate-limit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/setup-node@v4
3030
with:
3131
node-version: 20
32-
- uses: pnpm/action-setup@v3
32+
- uses: pnpm/action-setup@v4
3333
name: Install pnpm
3434
with:
3535
version: 9.0.4
@@ -48,7 +48,7 @@ jobs:
4848
4949
-
5050
name: docker network
51-
run: docker network create --subnet=172.23.42.0/16 ep_net
51+
run: docker network create --subnet=172.23.0.0/16 ep_net
5252
-
5353
name: build docker image
5454
run: |

‎.github/workflows/upgrade-from-latest-release.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
node: [18, 20, 21]
27+
node: [18, 20, 22]
2828
steps:
2929
-
3030
name: Check out latest release
3131
uses: actions/checkout@v4
3232
with:
33-
ref: master
33+
ref: develop #FIXME change to master when doing release
3434
-
3535
uses: actions/setup-node@v4
3636
with:
3737
node-version: ${{ matrix.node }}
38-
- uses: pnpm/action-setup@v3
38+
- uses: pnpm/action-setup@v4
3939
name: Install pnpm
4040
with:
4141
version: 9.0.4
@@ -85,7 +85,6 @@ jobs:
8585
ep_font_size
8686
ep_hash_auth
8787
ep_headings2
88-
ep_image_upload
8988
ep_markdown
9089
ep_readonly_guest
9190
ep_set_title_on_pad

‎.github/workflows/windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
-
3535
uses: actions/setup-node@v4
3636
with:
37-
node-version: 21
38-
- uses: pnpm/action-setup@v3
37+
node-version: 22
38+
- uses: pnpm/action-setup@v4
3939
name: Install pnpm
4040
with:
4141
version: 9.0.4
@@ -129,7 +129,7 @@ jobs:
129129
uses: actions/setup-node@v4
130130
with:
131131
node-version: 20
132-
- uses: pnpm/action-setup@v3
132+
- uses: pnpm/action-setup@v4
133133
name: Install pnpm
134134
with:
135135
version: 9.0.4

0 commit comments

Comments
 (0)