Try to fix Windows

Signed-off-by: Natalie Arellano <narellano@vmware.com>
buildpacks · Oct 23, 2024 · 9b87589 · 9b87589
1 parent d0ccbee
commit 9b87589
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/acceptance/exporter_test.go b/acceptance/exporter_test.go
@@ -406,6 +406,12 @@ func testExporterFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 
 							cacheFixtureDir := filepath.Join("testdata", "exporter", "cache-dir")
 							h.AssertNil(t, fsutil.Copy(cacheFixtureDir, cacheDir))
+							// We have to pre-create the tar files so that their digests do not change due to timestamps
+							// But, ':' in the filepath on Windows is not allowed
+							h.AssertNil(t, os.Rename(
+								filepath.Join(cacheDir, "committed", "sha256_258dfa0cc987efebc17559694866ebc91139e7c0e574f60d1d4092f53d7dff59.tar"),
+								filepath.Join(cacheDir, "committed", "sha256:258dfa0cc987efebc17559694866ebc91139e7c0e574f60d1d4092f53d7dff59.tar"),
+							))
 						})
 
 						it.After(func() {

diff --git a/...6ebc91139e7c0e574f60d1d4092f53d7dff59.tar → ...6ebc91139e7c0e574f60d1d4092f53d7dff59.tar b/...6ebc91139e7c0e574f60d1d4092f53d7dff59.tar → ...6ebc91139e7c0e574f60d1d4092f53d7dff59.tar
diff --git a/acceptance/testdata/restorer/Dockerfile b/acceptance/testdata/restorer/Dockerfile
@@ -8,6 +8,11 @@ ENV CNB_GROUP_ID=${cnb_gid}
 
 COPY ./container/ /
 
+# We have to pre-create the tar files so that their digests do not change due to timestamps
+# But, ':' in the filepath on Windows is not allowed
+RUN mv /cache/committed/sha256_2d9c9c638d5c4f0df067eeae7b9c99ad05776a89d19ab863c28850a91e5f2944.tar /cache/committed/sha256:2d9c9c638d5c4f0df067eeae7b9c99ad05776a89d19ab863c28850a91e5f2944.tar
+RUN mv /cache/committed/sha256_430338f576c11e5236669f9c843599d96afe28784cffcb2d46ddb07beb00df78.tar /cache/committed/sha256:430338f576c11e5236669f9c843599d96afe28784cffcb2d46ddb07beb00df78.tar
+
 ENTRYPOINT ["/cnb/lifecycle/restorer"]
 
 RUN groupadd cnb --gid ${cnb_gid} && \

diff --git a/...c99ad05776a89d19ab863c28850a91e5f2944.tar → ...c99ad05776a89d19ab863c28850a91e5f2944.tar b/...c99ad05776a89d19ab863c28850a91e5f2944.tar → ...c99ad05776a89d19ab863c28850a91e5f2944.tar
diff --git a/...599d96afe28784cffcb2d46ddb07beb00df78.tar → ...599d96afe28784cffcb2d46ddb07beb00df78.tar b/...599d96afe28784cffcb2d46ddb07beb00df78.tar → ...599d96afe28784cffcb2d46ddb07beb00df78.tar