Skip to content

Commit fd9ae84

Browse files
committed
Merge remote-tracking branch 'origin/master' into check-heartbeat
2 parents 3512f7b + f3ea96e commit fd9ae84

File tree

2 files changed

+32
-29
lines changed

2 files changed

+32
-29
lines changed

Diff for: .github/workflows/ci.yml

+29-11
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,35 @@ jobs:
2929
uses: actions/setup-node@v4
3030
with:
3131
node-version: ${{ matrix.node-version }}
32+
- run: npm ci
33+
- run: npm test
34+
env:
35+
CI: true
3236

33-
- name: Install dependencies
34-
run: npm ci
35-
36-
# in order to test our compliance with TypeScript v4.2 (older versions are not tested)
37-
- name: Install TypeScript 4.2
38-
run: npm i [email protected]
39-
if: ${{ matrix.node-version == '16' }}
37+
build-examples:
38+
runs-on: ubuntu-latest
39+
timeout-minutes: 10
4040

41-
- name: Compile each package
42-
run: npm run compile --workspaces --if-present
41+
strategy:
42+
fail-fast: false
43+
matrix:
44+
example:
45+
- custom-parsers
46+
- typescript
47+
- webpack-build
48+
- webpack-build-server
4349

44-
- name: Run tests
45-
run: npm test --workspaces
50+
steps:
51+
- name: Checkout repository
52+
uses: actions/checkout@v3
53+
54+
- name: Use Node.js 20
55+
uses: actions/setup-node@v3
56+
with:
57+
node-version: 20
58+
59+
- name: Build ${{ matrix.example }}
60+
run: |
61+
cd examples/${{ matrix.example }}
62+
npm install
63+
npm run build

Diff for: examples/cluster-nginx/docker-compose.yml

+3-18
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,41 @@ services:
33
image: nginx:alpine
44
volumes:
55
- ./nginx.conf:/etc/nginx/nginx.conf:ro
6-
links:
7-
- server-john
8-
- server-paul
9-
- server-george
10-
- server-ringo
116
ports:
12-
- "3000:80"
7+
- "3000:80"
138

149
server-john:
1510
build: ./server
16-
links:
17-
- redis
1811
expose:
19-
- "3000"
12+
- "3000"
2013
environment:
2114
- NAME=John
2215

2316
server-paul:
2417
build: ./server
25-
links:
26-
- redis
2718
expose:
2819
- "3000"
2920
environment:
3021
- NAME=Paul
3122

3223
server-george:
3324
build: ./server
34-
links:
35-
- redis
3625
expose:
3726
- "3000"
3827
environment:
3928
- NAME=George
4029

4130
server-ringo:
4231
build: ./server
43-
links:
44-
- redis
4532
expose:
4633
- "3000"
4734
environment:
4835
- NAME=Ringo
4936

5037
client:
5138
build: ./client
52-
links:
53-
- nginx
5439

5540
redis:
56-
image: redis:6
41+
image: redis:alpine
5742
expose:
5843
- "6379"

0 commit comments

Comments
 (0)