Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into check-heartbeat
Browse files Browse the repository at this point in the history
  • Loading branch information
tjenkinson committed Aug 9, 2024
2 parents 3512f7b + f3ea96e commit 0799c83
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 41 deletions.
55 changes: 32 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,49 @@ on:
schedule:
- cron: '0 0 * * 0'

permissions:
contents: read

jobs:
test-node:
runs-on: ubuntu-latest
timeout-minutes: 10

strategy:
fail-fast: false
matrix:
node-version:
- 18
- 20
node-version: [12, 14, 16]

steps:
- name: Checkout repository
uses: actions/checkout@v4

- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm test
env:
CI: true

- name: Install dependencies
run: npm ci

# in order to test our compliance with TypeScript v4.2 (older versions are not tested)
- name: Install TypeScript 4.2
run: npm i typescript@4.2
if: ${{ matrix.node-version == '16' }}
build-examples:
runs-on: ubuntu-latest
timeout-minutes: 10

- name: Compile each package
run: npm run compile --workspaces --if-present
strategy:
fail-fast: false
matrix:
example:
- custom-parsers
- typescript
- webpack-build
- webpack-build-server

- name: Run tests
run: npm test --workspaces
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Use Node.js 20
uses: actions/setup-node@v3
with:
node-version: 20

- name: Build ${{ matrix.example }}
run: |
cd examples/${{ matrix.example }}
npm install
npm run build
21 changes: 3 additions & 18 deletions examples/cluster-nginx/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,41 @@ services:
image: nginx:alpine
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf:ro
links:
- server-john
- server-paul
- server-george
- server-ringo
ports:
- "3000:80"
- "3000:80"

server-john:
build: ./server
links:
- redis
expose:
- "3000"
- "3000"
environment:
- NAME=John

server-paul:
build: ./server
links:
- redis
expose:
- "3000"
environment:
- NAME=Paul

server-george:
build: ./server
links:
- redis
expose:
- "3000"
environment:
- NAME=George

server-ringo:
build: ./server
links:
- redis
expose:
- "3000"
environment:
- NAME=Ringo

client:
build: ./client
links:
- nginx

redis:
image: redis:6
image: redis:alpine
expose:
- "6379"

0 comments on commit 0799c83

Please sign in to comment.