Skip to content

Commit 941d9d1

Browse files
authored
Merge branch 'develop' into feature/4653-add_actor-top_class_to_sequence_diagram
2 parents fcffa6c + aa50db8 commit 941d9d1

13 files changed

+124
-121
lines changed

.github/workflows/build-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/setup-node@v4
2525
with:
2626
cache: pnpm
27-
node-version: 18
27+
node-version-file: '.node-version'
2828

2929
- name: Install Packages
3030
run: pnpm install --frozen-lockfile

.github/workflows/build.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ on:
1212
permissions:
1313
contents: read
1414

15-
env:
16-
node-version: 18.x
17-
1815
jobs:
1916
build-mermaid:
2017
runs-on: ubuntu-latest
@@ -24,11 +21,11 @@ jobs:
2421
- uses: pnpm/action-setup@v2
2522
# uses version from "packageManager" field in package.json
2623

27-
- name: Setup Node.js ${{ env.node-version }}
24+
- name: Setup Node.js
2825
uses: actions/setup-node@v4
2926
with:
3027
cache: pnpm
31-
node-version: ${{ env.node-version }}
28+
node-version-file: '.node-version'
3229

3330
- name: Install Packages
3431
run: |

.github/workflows/e2e-applitools.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ env:
2121
jobs:
2222
e2e-applitools:
2323
runs-on: ubuntu-latest
24-
strategy:
25-
matrix:
26-
node-version: [18.x]
24+
container:
25+
image: cypress/browsers:node-20.11.0-chrome-121.0.6167.85-1-ff-120.0-edge-121.0.2277.83-1
26+
options: --user 1001
2727
steps:
2828
- if: ${{ ! env.USE_APPLI }}
2929
name: Warn if not using Applitools
@@ -35,10 +35,10 @@ jobs:
3535
- uses: pnpm/action-setup@v2
3636
# uses version from "packageManager" field in package.json
3737

38-
- name: Setup Node.js ${{ matrix.node-version }}
38+
- name: Setup Node.js
3939
uses: actions/setup-node@v4
4040
with:
41-
node-version: ${{ matrix.node-version }}
41+
node-version-file: '.node-version'
4242

4343
- if: ${{ env.USE_APPLI }}
4444
name: Notify applitools of new batch

.github/workflows/e2e.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,22 @@ permissions:
1717
contents: read
1818

1919
env:
20-
node-version: 18.x
2120
# For PRs and MergeQueues, the target commit is used, and for push events, github.event.previous is used.
2221
targetHash: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha || (github.event.before == '0000000000000000000000000000000000000000' && 'develop' || github.event.before) }}
2322

2423
jobs:
2524
cache:
2625
runs-on: ubuntu-latest
26+
container:
27+
image: cypress/browsers:node-20.11.0-chrome-121.0.6167.85-1-ff-120.0-edge-121.0.2277.83-1
28+
options: --user 1001
2729
steps:
2830
- uses: actions/checkout@v4
2931
- uses: pnpm/action-setup@v2
3032
- name: Setup Node.js
3133
uses: actions/setup-node@v4
3234
with:
33-
node-version: 18.x
35+
node-version-file: '.node-version'
3436
- name: Cache snapshots
3537
id: cache-snapshot
3638
uses: actions/cache@v4
@@ -57,6 +59,9 @@ jobs:
5759

5860
e2e:
5961
runs-on: ubuntu-latest
62+
container:
63+
image: cypress/browsers:node-20.11.0-chrome-121.0.6167.85-1-ff-120.0-edge-121.0.2277.83-1
64+
options: --user 1001
6065
needs: cache
6166
strategy:
6267
fail-fast: false
@@ -68,10 +73,10 @@ jobs:
6873
- uses: pnpm/action-setup@v2
6974
# uses version from "packageManager" field in package.json
7075

71-
- name: Setup Node.js ${{ env.node-version }}
76+
- name: Setup Node.js
7277
uses: actions/setup-node@v4
7378
with:
74-
node-version: ${{ env.node-version }}
79+
node-version-file: '.node-version'
7580

7681
# These cached snapshots are downloaded, providing the reference snapshots.
7782
- name: Cache snapshots

.github/workflows/lint.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ on:
1313
permissions:
1414
contents: write
1515

16-
env:
17-
node-version: 18.x
18-
1916
jobs:
2017
lint:
2118
runs-on: ubuntu-latest
@@ -25,11 +22,11 @@ jobs:
2522
- uses: pnpm/action-setup@v2
2623
# uses version from "packageManager" field in package.json
2724

28-
- name: Setup Node.js ${{ env.node-version }}
25+
- name: Setup Node.js
2926
uses: actions/setup-node@v4
3027
with:
3128
cache: pnpm
32-
node-version: ${{ env.node-version }}
29+
node-version-file: '.node-version'
3330

3431
- name: Install Packages
3532
run: |

.github/workflows/publish-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/setup-node@v4
3232
with:
3333
cache: pnpm
34-
node-version: 18
34+
node-version-file: '.node-version'
3535

3636
- name: Install Packages
3737
run: pnpm install --frozen-lockfile

.github/workflows/release-preview-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/setup-node@v4
2020
with:
2121
cache: pnpm
22-
node-version: 18.x
22+
node-version-file: '.node-version'
2323

2424
- name: Install Packages
2525
run: |

.github/workflows/release-publish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
- uses: pnpm/action-setup@v2
1515
# uses version from "packageManager" field in package.json
1616

17-
- name: Setup Node.js v18
17+
- name: Setup Node.js
1818
uses: actions/setup-node@v4
1919
with:
2020
cache: pnpm
21-
node-version: 18.x
21+
node-version-file: '.node-version'
2222

2323
- name: Install Packages
2424
run: |

.github/workflows/test.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ on: [push, pull_request, merge_group]
55
permissions:
66
contents: read
77

8-
env:
9-
node-version: 18.x
10-
118
jobs:
129
unit-test:
1310
runs-on: ubuntu-latest
@@ -17,11 +14,11 @@ jobs:
1714
- uses: pnpm/action-setup@v2
1815
# uses version from "packageManager" field in package.json
1916

20-
- name: Setup Node.js ${{ env.node-version }}
17+
- name: Setup Node.js
2118
uses: actions/setup-node@v4
2219
with:
2320
cache: pnpm
24-
node-version: ${{ env.node-version }}
21+
node-version-file: '.node-version'
2522

2623
- name: Install Packages
2724
run: |

.node-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v20.11.0

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM node:18.19.0-alpine3.18 AS base
1+
FROM node:20.11.0-alpine3.19 AS base
22
RUN wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.shrc" SHELL="$(which sh)" sh -

package.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"@types/jsdom": "^21.1.1",
7575
"@types/lodash": "^4.14.194",
7676
"@types/mdast": "^3.0.11",
77-
"@types/node": "^18.16.0",
77+
"@types/node": "^20.11.10",
7878
"@types/prettier": "^2.7.2",
7979
"@types/rollup-plugin-visualizer": "^4.2.1",
8080
"@typescript-eslint/eslint-plugin": "^6.7.2",
@@ -122,9 +122,6 @@
122122
"vite-plugin-istanbul": "^4.1.0",
123123
"vitest": "^0.34.0"
124124
},
125-
"volta": {
126-
"node": "18.19.0"
127-
},
128125
"nyc": {
129126
"report-dir": "coverage/cypress"
130127
}

0 commit comments

Comments
 (0)