github/zigbee-OTA
2
0
Fork 0
mirror of https://github.com/Koenkk/zigbee-OTA.git synced 2026-10-07 11:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Allow images with same sha512 when modelId differs (#1223)

Browse Source
This commit is contained in:
Koen Kanters
2026-07-06 20:30:23 +02:00
committed by GitHub
parent 248826c725
commit d514a589ec
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common.ts
+1 -1
View File
@@ -206,7 +206,7 @@ export function hasManufacturerImage(list: RepoImageMeta[], image: RepoImageMeta
return list.some( return list.some(
(i) => (i) =>
path.posix.dirname(i.url) === imageBasePath && path.posix.dirname(i.url) === imageBasePath &&
(i.sha512 === image.sha512 || ((i.sha512 === image.sha512 && !(i.modelId && image.modelId && i.modelId !== image.modelId)) ||
(i.fileVersion === image.fileVersion && (i.fileVersion === image.fileVersion &&
i.imageType === image.imageType && i.imageType === image.imageType &&
i.manufacturerCode === image.manufacturerCode && i.manufacturerCode === image.manufacturerCode &&
tests/ghw_check_ota_pr.test.ts
+25
View File
@@ -490,6 +490,31 @@ Text after end tag`);
expect(baseManifest).toStrictEqual([IMAGE_V14_2_MANUF_METAS]); expect(baseManifest).toStrictEqual([IMAGE_V14_2_MANUF_METAS]);
}); });
it("success with SHA-matching image present when modelId differs", async () => {
filePaths = [useImage(IMAGE_V14_2_COPY), useImage(IMAGE_V14_2)];
const newContext = withBody(
`\`\`\`json [{"fileName": "${IMAGE_V14_2_COPY}", "modelId": "model_a"}, {"fileName": "${IMAGE_V14_2}", "modelId": "model_b"}] \`\`\``,
);
// @ts-expect-error mock
await checkOtaPR(github, core, newContext);
expect(readManifestSpy).toHaveBeenCalledWith(common.BASE_INDEX_MANIFEST_FILENAME);
expect(readManifestSpy).toHaveBeenCalledWith(common.PREV_INDEX_MANIFEST_FILENAME);
expect(addImageToBaseSpy).toHaveBeenCalledTimes(2);
expect(addImageToPrevSpy).toHaveBeenCalledTimes(0);
expect(writeManifestSpy).toHaveBeenCalledTimes(2);
expect(writeManifestSpy).toHaveBeenCalledWith(common.BASE_INDEX_MANIFEST_FILENAME, [
{
...IMAGE_V14_2_METAS,
fileName: IMAGE_V14_2_COPY,
modelId: "model_a",
url: IMAGE_V14_2_METAS.url.replace(IMAGE_V14_2, IMAGE_V14_2_COPY),
},
withExtraMetas(IMAGE_V14_2_METAS, {modelId: "model_b"}),
]);
});
it("failure with spec-matching image present", async () => { it("failure with spec-matching image present", async () => {
filePaths = [useImage(IMAGE_V14_2_COPY), useImage(IMAGE_V14_2)]; filePaths = [useImage(IMAGE_V14_2_COPY), useImage(IMAGE_V14_2)];
// bypass initial "conflict" match by using random `minFileVersion` // bypass initial "conflict" match by using random `minFileVersion`