Skip to content

Commit bfc3347

Browse files
authored
chore: fix os workflow matrix (#63)
1 parent c4f5d84 commit bfc3347

File tree

11 files changed

+57
-45
lines changed

11 files changed

+57
-45
lines changed

.eslintignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

.eslintrc

Lines changed: 0 additions & 10 deletions
This file was deleted.

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

.github/workflows/test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ on:
66

77
jobs:
88
build:
9-
runs-on: ubuntu-latest
109
strategy:
1110
matrix:
1211
os: [ubuntu-latest, macOS-latest, windows-latest]
13-
node-version: [18.x, 20.x]
12+
node-version: [18, 20]
13+
runs-on: ${{ matrix.os }}
14+
1415
steps:
1516
- uses: actions/checkout@v4
1617

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
package-lock=false
2+
save-exact=true

.prettierrc

Lines changed: 0 additions & 15 deletions
This file was deleted.

.prettierrc.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"singleQuote": false,
3+
"trailingComma": "all",
4+
"useTabs": true,
5+
"printWidth": 120,
6+
"overrides": [
7+
{
8+
"files": ["*.yml", "*.json"],
9+
"options": {
10+
"tabWidth": 2,
11+
"useTabs": false
12+
}
13+
}
14+
]
15+
}

eslint.config.mjs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import prettierConfig from "eslint-config-prettier";
2+
import prettierPlugin from "eslint-plugin-prettier/recommended";
3+
import globals from "globals";
4+
import js from "@eslint/js";
5+
6+
export default [
7+
js.configs.recommended,
8+
prettierConfig,
9+
prettierPlugin,
10+
{
11+
languageOptions: {
12+
globals: {
13+
...globals.node,
14+
...globals.browser,
15+
global: true,
16+
},
17+
},
18+
},
19+
{
20+
ignores: ["coverage/*", "dist/*"],
21+
},
22+
];

lib/collector-heap-used-and-size.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ const CollectorHeapUsedAndSize = class CollectorHeapUsedAndSize {
5050
let mem = null;
5151
try {
5252
mem = process.memoryUsage();
53-
} catch (ex) {
54-
// eslint-disable-line no-empty
55-
}
53+
// eslint-disable-next-line
54+
} catch (ex) {}
5655
return mem;
5756
}
5857
};

lib/collector-process-resident-memory.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,8 @@ const CollectorProcessResidentMemory = class CollectorProcessResidentMemory {
8383
let mem;
8484
try {
8585
mem = process.memoryUsage();
86-
} catch (ex) {
87-
// eslint-disable-line no-empty
88-
}
86+
// eslint-disable-next-line
87+
} catch (ex) {}
8988
return mem;
9089
}
9190

0 commit comments

Comments
 (0)