Skip to content

Commit

Permalink
Upgrade to Node 20
Browse files Browse the repository at this point in the history
VS Code is now based on Node 20
Node 18 is in maintenance mode since September 2023

mock-fs is returning inconsistent result with Node 20 in our case, so
removed it from test and ensure temporary folder is created/deleted

Signed-off-by: Aurélien Pupier <apupier@redhat.com>
  • Loading branch information
apupier authored and fbricon committed Sep 24, 2024
1 parent 7bbf6cf commit ee759ea
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
- uses: actions/checkout@v4

# Set up Node
- name: Use Node 18
- name: Use Node 20
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
registry-url: 'https://registry.npmjs.org'

# Run install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
- uses: actions/checkout@v4

# Set up Node
- name: Use Node 18
- name: Use Node 20
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
registry-url: 'https://registry.npmjs.org'

# Run install dependencies
Expand Down
15 changes: 8 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@types/getos": "^3.0.1",
"@types/mocha": "^10.0.0",
"@types/mock-fs": "^4.13.1",
"@types/node": "^18.19.29",
"@types/node": "^20.14.8",
"@types/object-hash": "^3.0.2",
"@types/picomatch": "^3.0.1",
"@types/ua-parser-js": "^0.7.36",
Expand Down
14 changes: 7 additions & 7 deletions src/tests/gitpod/gitpodIdManager.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as assert from 'assert';
import * as mock from 'mock-fs';
import * as fs from 'fs';
import { GitpodIdProvider } from '../../node/cloud/gitpodIdProvider'
import env from '../../common/envVar';
import { FileSystemIdProvider } from '../../node/fileSystemIdManager';
Expand All @@ -8,14 +8,14 @@ const redhatDir = `${process.cwd()}/.redhat/`;

suite('Test gitpod Id manager', () => {
setup(() => {
mock({
'.redhat': {
'anonymousId': 'some-uuid'
}
});
if (fs.existsSync(redhatDir)) {
fs.rmSync(redhatDir, { recursive: true, force: true });
}
});
teardown(() => {
mock.restore();
if (fs.existsSync(redhatDir)) {
fs.rmSync(redhatDir, { recursive: true, force: true });
}
});
test('Should generate Red Hat UUID from GITPOD_GIT_USER_EMAIL env', async () => {
env.GITPOD_GIT_USER_EMAIL = 'some.user@company.com';
Expand Down

0 comments on commit ee759ea

Please sign in to comment.