Skip to content

Commit 7bb492a

Browse files
authored
Merge branch 'master' into ci/add-pr-assistant
2 parents a91ab41 + 2516e1a commit 7bb492a

39 files changed

+3704
-2236
lines changed

.github/workflows/check-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Node.js
1616
uses: actions/setup-node@v2
1717
with:
18-
node-version: '16'
18+
node-version: '24'
1919

2020
- name: Install dependencies
2121
run: yarn install

.github/workflows/nodejs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v2
11-
- name: Use Node.js 16.x
11+
- name: Use Node.js 24.x
1212
uses: actions/setup-node@v1
1313
with:
14-
node-version: 16.x
14+
node-version: 24.x
1515
- name: Cache dependencies
1616
uses: actions/cache@v3
1717
with:

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-22.04
1313
steps:
1414
- uses: actions/checkout@v2
15-
- name: Use Node.js 16.x
15+
- name: Use Node.js 24.x
1616
uses: actions/setup-node@v4
1717
with:
18-
node-version: 16.x
18+
node-version: 24.x
1919
- run: yarn install
2020
- run: yarn test

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v16.20.2
1+
v24

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:18.20-slim as build-stage
1+
FROM node:24-slim as build-stage
22

33
RUN apt update
44
RUN apt install git -y

dev.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:16.20-slim
1+
FROM node:24-slim
22

33
WORKDIR /usr/src/app
44

jest.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ module.exports = {
3030
setupFilesAfterEnv: ['./jest.setup.redis-mock.js', './jest.setup.mongo-repl-set.js'],
3131

3232
globalTeardown: './jest.global-teardown.js',
33+
testTimeout: 15000,
3334
};

jest.global-teardown.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
const process = require('process');
2+
const mongoTeardown = require('@shelf/jest-mongodb/teardown');
3+
4+
module.exports = async () => {
5+
/**
6+
* Cleanup MongoDB Memory Server
7+
*
8+
* @shelf/jest-mongodb should handle this automatically, but we try to ensure cleanup
9+
*/
10+
await mongoTeardown();
211

3-
module.exports = () => {
412
if (process.env.CI) {
513
setTimeout(() => {
614
process.exit(0);
715
}, 1000);
816
}
9-
};
17+
};

jest.setup.mongo-repl-set.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ beforeAll(async () => {
1515
let status = await admin.command({ replSetGetStatus: 1 }).catch(() => null);
1616

1717
if (status && status.ok) {
18-
console.log('✅ Replica set already initialized');
18+
// console.log('✅ Replica set already initialized');
1919
} else {
2020
await admin.command({ replSetInitiate: {} });
21-
console.log('✅ Replica set initiated');
21+
// console.log('✅ Replica set initiated');
2222
}
2323

2424
const startTime = Date.now();
@@ -39,7 +39,7 @@ beforeAll(async () => {
3939
await new Promise(resolve => setTimeout(resolve, 1000));
4040
} while (Date.now() - startTime < timeout);
4141

42-
console.log('✅ Replica set is stable');
42+
// console.log('✅ Replica set is stable');
4343
} catch (err) {
4444
console.error('❌ Failed to initiate replica set:', err);
4545
}

jest.setup.redis-mock.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ beforeAll(async () => {
1111
.start();
1212

1313
const port = redisTestContainer.getMappedPort(6379);
14-
const host = redisTestContainer.getContainerIpAddress();
14+
const host = redisTestContainer.getHost();
1515

1616
/**
1717
* Set environment variable for redisHelper to connect to redis container

0 commit comments

Comments
 (0)