Skip to content

Commit 0328c7e

Browse files
committed
Fix configuration cache incompatibility
details: Task `:testSuiteOciRegistryData` of type `io.github.sgtsilvio.gradle.oci.image.OciRegistryDataTask`: cannot serialize object of type 'org.gradle.api.internal.artifacts.result.DefaultResolvedArtifactResult', a subtype of 'org.gradle.api.artifacts.result.ArtifactResult', as these are not supported with the configuration cache.
1 parent fd882b1 commit 0328c7e

2 files changed

Lines changed: 83 additions & 1 deletion

File tree

src/functionalTest/kotlin/io/github/sgtsilvio/gradle/oci/TestProject.kt

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ internal class TestProject(projectDir: File) {
4646
runtime(project).tag("latest")
4747
runtime(constraint("library:eclipse-temurin:20.0.1_9-jre-jammy"))
4848
runtime("hivemq:hivemq4:4.16.0")
49+
runtime("library:redis:sha256!0779069b3c24a47a2f681855c1c01d046793e7c5f7d2b079c2aa0652c42eaf0e").tag("8.0.0-alpine")
4950
}
5051
}
5152
}
@@ -190,6 +191,77 @@ internal class TestProject(projectDir: File) {
190191
"d6ae466d10fc5d00afc56a152620df8477ecd22369053f2514d2ea38ad5ed1fb",
191192
"d73cf48caaac2e45ad76a2a9eb3b311d0e4eb1d804e3d2b9cf075a1fa31e6f92",
192193
)
194+
val redisIndexDigest = "7e41546a32631e803b8bb29865342e1633a71f9ef6f7ab2868baf5361bdf2087"
195+
val redisManifestDigests = setOf(
196+
"2279d970250b64a7477b0f77724d6eeba3af43f9b0615309967cb08130d20db0",
197+
"40da8f877ff1f214018cadff49742c5f9b0481c1638b16cb8d3f52a789f25c7c",
198+
"5daa2e5cc6effd6011964d2c6761eccd67523815506aa9a57a7c785cb8cb21b9",
199+
"7e41546a32631e803b8bb29865342e1633a71f9ef6f7ab2868baf5361bdf2087",
200+
"8d05846ddc09dd0ed18733366630d6a0cdc81b00b302853ec5e66028d418a076",
201+
"9022dd8ceb38564c256adab18307aba9c4015a7ff44fdefe588f64a04e4fe92e",
202+
"9cb348db620099108a4fa39f45939c14ea01fd9e407515698549483cf616eb5d",
203+
"9de7f79ffcea5408bf968ea5b91f6116eafe1a24c97bf5bde348133103955028",
204+
"a2b880fee292120fe74f7f2e25cdc04e00e80d12ee8f98c53d562d252f8cbb11",
205+
)
206+
val redisConfigAndLayerDigests = setOf(
207+
"075129f30b31cbb1654653588b25f41fd5d899285e15d6fee8739cc39c609ede",
208+
"184b14480d317057da092a0994ad6baf4b2df588108f43969f8fd56f021af2c6",
209+
"18a3bc1f6e40633000e515c117c76b86a4748ee69900ec68edcd21e4bc675a10",
210+
"1b7181eaf68223ddcee59316abf0f05d2e2377dcd7187aae89549641c24390e2",
211+
"1e98aaf59b67d32794055b335cfdcdb0c4fce301ebb58612a7ff09c11dde1dce",
212+
"2af58ecfedf0a2327f6d3e09044dff7f47b322963e8a6d6fa2d504ca87179ed0",
213+
"2def0c28cea214ac0f47ba9db57dbe5ee2740220e96275503c403de29fd283e4",
214+
"2e7279224f08c0d30578f4dbef204f0d766afabbd04daf59490323251b558dae",
215+
"2ec361d6f6cf728cf599dd5cbb84a3b43822d164c184534d4650f91ac9cea36f",
216+
"2f262b87977f78b0ee89f9c4ded66b6dc502aae2136cd6f8d5c720994a377ef6",
217+
"32617ca14c22b7a6e74fd0287233c89cd82724992d76be7572bfd6d20b50c651",
218+
"32dedcb42eb5e90b63628945860ba8b939e2057181c8f89cdb2fc2d36fc9f55a",
219+
"4dfbe3dd27371f1c37af36d90cf012f849a0806aeabd01177d0dd5e1f05b2685",
220+
"4f4fb700ef54461cfa02571ae0db9a0dc1e0cdb5577484a6d75e68dc38e8acc1",
221+
"568cf143d108dcce5c6bb165b01c719b75ae6dcb0017e84772613704aa8ebf75",
222+
"5e306bc7f3cd8273ca2f216836302ad21df95fa6a35edc08f6d45e13364a9fd5",
223+
"6017239f40fa06f59a01941964103b2a9f1cfa98c18f10c31292fb974d520453",
224+
"61bc03c307c042b0019919be4aca7c5db8571469a1970bbca53c2125d9eaf35f",
225+
"64136cebabc3fd206a2e54d36143516c9e9dd18c1a4a6d11d2f12850920bd35e",
226+
"69aa61ccf55e5bf8e7a069b89e8afb42b4f3443b3785868795af8046d810d608",
227+
"69db166949ac1fa95d91e84062a1f8d8f91cb193ec8b9e408a252abe079de849",
228+
"6ca3626dc272a208b340786413012f8e96082886ec9e99777808c335a9a0f5f9",
229+
"6e771e15690e2fabf2332d3a3b744495411d6e0b00b2aea64419b58b0066cf81",
230+
"74a524ea8c131a508928d9c19a6f2d460890d24e9fb1476fa3ca15d4830feac2",
231+
"76099982f06682e28a60c3b774ef20931d07b0a2f551203484e633d8c0361ee7",
232+
"7a37282d43d3092d42cc7aafd345de189dcb8dc97f7c0c44663ffdbe107dfce4",
233+
"7df33f7ad8beb367ac09bdd1b2f220db3ee2bbdda14a6310d1340e5628b5ba88",
234+
"7ec1e82cde0331011d3988f758fecb0e2648189163ac977c79eca78e86015ca3",
235+
"83f63f5840b3f089bf7d6373046ce1bb5b6e554adcf18738418e7379522becae",
236+
"85f3b18f9f5a8655db86c6dfb02bb01011ffef63d10a173843c5c65c3e9137b7",
237+
"878a566114717809f918a100e6a2d5745e2b81ecbb378f3e5908df3026920199",
238+
"899e5c38d3252b6acc3a973779a2961e0cf93a74e74d647dd5b0a4581705b29f",
239+
"9826632aa5dd8df6206034a82fe85493f1b7c96691d94fe4abec5ab08a187345",
240+
"9b92922c442a61cfe54344354ebd3fbc995fa57fb8b78a500f20de74adb2c53f",
241+
"a0b4e1a52acd02a416da10b437f5d3628e64f33036a331fa34870f5a6d02143a",
242+
"ac36f2a7f82666649e1b57d6c77644c4f9c1b715872358446fd6f53a3efc7b2a",
243+
"b38de7eb7132bf24de27447f0d6330d4299fe0264ac584c5f44fa45bfb8da0f3",
244+
"b490790304f175a292805f9ecc5d125e166eb2123162b16799c043b40349fef2",
245+
"b782747b1d523d78e2eccdc898011eb18b9e831309cefc10bb6601fcfe3aa1d0",
246+
"b79bc66df2694d9c2acf38a54dff61e7752ea57aa3cf5c6f105e09b33dec5c1c",
247+
"bb7e93547ce2a5f3a71b44b5ee5dcc65a14ecd52046ad0ba4a1b239955f014ff",
248+
"bf3ce4aeaa63f6aadfde06cb0484bcf74cee44042970225bcd113ab3b67f7c3c",
249+
"c1a599607158512214777614f916f8193d29fd34b656d47dfc26314af01e2af4",
250+
"c44a25f41bb21e5989391abaeedee4cc0e0680f2370fc86e0cf01c8939d4b662",
251+
"c7a324ded8895b39df9977bfe580708e3ff9c28d3a7b4fb788f16b001563006f",
252+
"c7b787002cc542b23400b90a538040c1e62f6c5c4c5f1158b2a39f02bce4f74e",
253+
"c8a003ad8d70e3afeb6558df4644ea31203ab133164940c38829c4397af22a3b",
254+
"cb1b308b7bf97cf1c9193f2017908eb1e5f91e062736541675f1c3b99242ed1c",
255+
"d1d0b116f6bfbf2865b2158e8e42d73252d576795eab15747a6d94ac95a15868",
256+
"d35a244728108ce0560ebcb807b30a26f93b9f6581d987e525f43c139f9d534b",
257+
"d87f59363737dd9cf44d245645df515e38a32c2635e96ebf454f189885b4652f",
258+
"dc68676f3e0357f3cea9d33f03ccb30049845def061097badd6c82664c598c26",
259+
"ddea5b1619a1f8fd36f2c4a9dc8742e5fc66b38fc3cc43c657bc3b7abc4adc86",
260+
"e1cad2c79c250951a6e34664a13fbeaa39e870b4c2b68527440877befffb4e56",
261+
"eae6e1e750cad68b67a3bfcbc96db27a0a94df513b7d71bdbad2a4a6cacd8b87",
262+
"f18232174bc91741fdf3da96d85011092101a032a93a388b79e99e69c2d5c870",
263+
"fc10234629e49fd6134d9fcab3db5c1ef67f666879ebeb399d25ef4639f433dc",
264+
)
193265
val blobDigests = setOf(
194266
testIndexDigest,
195267
testManifest1Digest,
@@ -198,6 +270,9 @@ internal class TestProject(projectDir: File) {
198270
hivemqIndexDigest,
199271
hivemqManifestDigest,
200272
*hivemqConfigAndLayerDigests.toTypedArray(),
273+
redisIndexDigest,
274+
*redisManifestDigests.toTypedArray(),
275+
*redisConfigAndLayerDigests.toTypedArray(),
201276
)
202277

203278
val registryDir = buildDir.resolve("oci/registries/testSuite")
@@ -218,6 +293,13 @@ internal class TestProject(projectDir: File) {
218293
"repositories/hivemq/hivemq4/_manifests/revisions/sha256/$hivemqManifestDigest/link",
219294
"repositories/hivemq/hivemq4/_manifests/tags/4.16.0/current/link",
220295
"repositories/hivemq/hivemq4/_manifests/tags/4.16.0/index/sha256/$hivemqIndexDigest/link",
296+
*redisConfigAndLayerDigests.map { "repositories/library/redis/_layers/sha256/$it/link" }
297+
.toTypedArray(),
298+
"repositories/library/redis/_manifests/revisions/sha256/$redisIndexDigest/link",
299+
*redisManifestDigests.map { "repositories/library/redis/_manifests/revisions/sha256/$it/link" }
300+
.toTypedArray(),
301+
"repositories/library/redis/_manifests/tags/8.0.0-alpine/current/link",
302+
"repositories/library/redis/_manifests/tags/8.0.0-alpine/index/sha256/$redisIndexDigest/link",
221303
),
222304
registryDir.leaves.mapTo(TreeSet()) { it.toRelativeString(registryDir) },
223305
)

src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/resolution/OciImageInputResolution.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ internal fun resolveOciImageInputs(
2727
val variantSelectorsToImageInput = HashMap<Pair<Platform, Set<VariantSelector>>, OciImagesTask.ImageInput>()
2828
for ((platform, configuration) in platformConfigurationPairs) {
2929
val artifacts = configuration.incoming.artifacts
30-
taskDependenciesProvider.addAll(artifacts.resolvedArtifacts)
30+
taskDependenciesProvider.addAll(artifacts.artifactFiles.elements)
3131
val capabilitiesToVariantInput = artifacts.variantArtifacts.groupBy({ it.capabilities }) { it.file }
3232
.mapValues { (_, files) -> OciImagesTask.VariantInput(files.first(), files.drop(1)) }
3333
val imageSpecs = collectOciImageSpecs(configuration.incoming.resolutionResult.root)

0 commit comments

Comments
 (0)