Skip to content

Commit 0c7f6cd

Browse files
authored
Merge branch 'main' into fix/update-reuseable-ci-and-just
Signed-off-by: Mats Johansson <56579809+mmjohansson@users.noreply.github.com>
2 parents 525503c + 782ef73 commit 0c7f6cd

File tree

5 files changed

+72
-56
lines changed

5 files changed

+72
-56
lines changed

.github/workflows/openssf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
contents: read
1818
security-events: write
1919
id-token: write
20-
uses: diggsweden/reusable-ci/.github/workflows/security-openssf-scorecard.yml@e29145e720cef0b86ef147c72c2d001b5ac6c8b9 # v2.4.2
20+
uses: diggsweden/reusable-ci/.github/workflows/security-openssf-scorecard.yml@e1e1387d5b0399bb5edb00e40485746772344176 # v2.6.0
2121
with:
2222
publish-results: true

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
1616

1717
- name: Set up Node.js
18-
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
18+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
1919
with:
20-
node-version: '24.11.1'
20+
node-version: '24.13.0'
2121

2222
- name: Install dependencies
2323
run: npm ci

package-lock.json

Lines changed: 49 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"type": "module",
99
"engines": {
10-
"node": "<=24.11.1"
10+
"node": "<=24.13.0"
1111
},
1212
"files": [
1313
"dist",
@@ -32,16 +32,16 @@
3232
"test": "test"
3333
},
3434
"devDependencies": {
35-
"@stoplight/spectral-formats": "^1.5.0",
36-
"@types/adm-zip": "^0.5.6",
37-
"@types/express": "^5.0.1",
38-
"@types/jest": "^30.0.0",
39-
"@types/node": "^24.0.0",
40-
"jest": "^30.0.4",
41-
"standard-version": "^9.5.0",
42-
"ts-jest": "^29.4.1",
43-
"ts-node": "^10.9.2",
44-
"typescript": "^5.9.2"
35+
"@stoplight/spectral-formats": "1.8.2",
36+
"@types/adm-zip": "0.5.7",
37+
"@types/express": "5.0.6",
38+
"@types/jest": "30.0.0",
39+
"@types/node": "24.10.9",
40+
"jest": "30.2.0",
41+
"standard-version": "9.5.0",
42+
"ts-jest": "29.4.6",
43+
"ts-node": "10.9.2",
44+
"typescript": "5.9.3"
4545
},
4646
"dependencies": {
4747
"@apidevtools/swagger-parser": "^12.1.0",

src/app.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,15 @@ async function main(): Promise<void> {
191191
const diagnosticReports: DiagnosticReport[] = customDiagnostic.processDiagnosticInformation();
192192

193193
if (argv.dex != null) {
194-
const reportHandler = new ExcelReportProcessor({
195-
outputFilePath: argv.dex,
196-
});
197-
reportHandler.generateReportDocument(customDiagnostic);
194+
try {
195+
const reportHandler = new ExcelReportProcessor({
196+
outputFilePath: argv.dex,
197+
});
198+
reportHandler.generateReportDocument(customDiagnostic);
199+
} catch (dexError: any) {
200+
logErrorToFile(dexError);
201+
console.error(chalk.red('Misslyckades att skriva till excelfilen!'));
202+
}
198203
}
199204

200205
/**

0 commit comments

Comments
 (0)