Skip to content

Commit b3b7a55

Browse files
Merge pull request #85 from VirdocsSoftware/hotfix/v2.13.1
hotfix v2.13.1 to main
2 parents c3f771d + f49bdf4 commit b3b7a55

2 files changed

Lines changed: 19 additions & 13 deletions

File tree

.github/actions/static-analysis/layer_dependency_analysis.js

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ class PackageJsonDependencyComparator {
1313
missingInFirst: [],
1414
missingInSecond: []
1515
};
16-
console.log('Comparing dependencies:', packageJson1, packageJson2);
16+
// console.log('Comparing dependencies:', packageJson1, packageJson2);
1717

1818
// Get all dependencies from both files
1919
const deps1 = this._getAllDependencies(packageJson1);
2020
const deps2 = this._getAllDependencies(packageJson2);
21-
console.log('Dependencies:', deps1, deps2);
21+
// console.log('Dependencies:', deps1, deps2);
2222

2323
// Compare dependencies
2424
for (const [dep, version1] of Object.entries(deps1)) {
2525
const version2 = deps2[dep];
26-
console.log('Comparing dependency:', dep, version1, version2);
26+
// console.log('Comparing dependency:', dep, version1, version2);
2727

2828
if (version2 === undefined) {
2929
continue; // we don't care about missing dependencies
@@ -69,21 +69,21 @@ class PackageJsonDependencyComparator {
6969
let parts = [];
7070

7171
if (report.mismatches.length > 0) {
72-
const mismatchItems = report.mismatches.map(({ dependency, version1, version2 }) =>
72+
const mismatchItems = report.mismatches.map(({ dependency, version1, version2 }) =>
7373
`${dependency}:${version1}vs${version2}`
7474
).join(', ');
7575
parts.push(`Mismatched against layer: [${mismatchItems}]`);
7676
}
7777

7878
if (report.missingInFirst.length > 0) {
79-
const missingFirstItems = report.missingInFirst.map(({ dependency, version }) =>
79+
const missingFirstItems = report.missingInFirst.map(({ dependency, version }) =>
8080
`${dependency}:${version}`
8181
).join(', ');
8282
parts.push(`Missing in First: [${missingFirstItems}]`);
8383
}
8484

8585
if (report.missingInSecond.length > 0) {
86-
const missingSecondItems = report.missingInSecond.map(({ dependency, version }) =>
86+
const missingSecondItems = report.missingInSecond.map(({ dependency, version }) =>
8787
`${dependency}:${version}`
8888
).join(', ');
8989
parts.push(`Missing in Second: [${missingSecondItems}]`);
@@ -142,17 +142,23 @@ function main() {
142142
const domains = JSON.parse(process.argv[3]); // {"include": [{"project": "domain1"}, {"project": "domain2"}]}
143143

144144
const domainPackageJsons = domains.include.filter(domain => domain.project != '.').map(domain => {
145-
return {
146-
project: domain.project,
147-
packageJson: JSON.parse(fs.readFileSync(process.cwd() + '/domains/' + domain.project + '/package.json', 'utf8'))
148-
};
149-
});
145+
try {
146+
const packageJson = JSON.parse(fs.readFileSync(process.cwd() + '/domains/' + domain.project + '/package.json', 'utf8'));
147+
return {
148+
project: domain.project,
149+
packageJson
150+
};
151+
} catch (error) {
152+
console.error('Error parsing package.json for domain:', domain.project, error);
153+
return undefined;
154+
}
155+
}).filter(domain => domain !== undefined);
150156

151157
// print the test plan
152158
console.log('Test plan:');
153159
console.log('Layer package.json:', layerPackageJson);
154160
console.log('Domains:', domains);
155-
console.log('Domain package.json:', JSON.stringify(domainPackageJsons, null, 2));
161+
// console.log('Domain package.json:', JSON.stringify(domainPackageJsons, null, 2));
156162

157163
layerDependencyAnalysis.run(layerPackageJson, domainPackageJsons);
158164
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "github-actions",
3-
"version": "2.13.0",
3+
"version": "2.13.1",
44
"description": "Used to store GitHub actions for use across the enterprise",
55
"scripts": {
66
"test": "./tooling/scripts/run_tests.sh",

0 commit comments

Comments
 (0)