Fix reacting to removed published artifacts

Only handle them when they are artifacts sigstore created a signature for. Fixes #414 Signed-off-by: Louis Jacomet <louis@gradle.com>
sigstore · Apr 6, 2023 · 8fb89b6 · 8fb89b6
1 parent e1b8824
commit 8fb89b6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...gstore-gradle-sign-base-plugin/src/main/kotlin/dev/sigstore/sign/SigstoreSignExtension.kt b/...gstore-gradle-sign-base-plugin/src/main/kotlin/dev/sigstore/sign/SigstoreSignExtension.kt
@@ -96,17 +96,18 @@ abstract class SigstoreSignExtension(private val project: Project) {
         }
         publication.whenPublishableArtifactRemoved {
             val publishableArtifact = this
+            // Ignore artifacts that we have not added a signature for
+            val artifact = artifacts.remove(publishableArtifact) ?: return@whenPublishableArtifactRemoved
             signTask.configure {
-                signatures.findByName(file.name)
-                    ?.takeIf { publishableArtifact in it.builtBy  }
+                signatures.findByName(publishableArtifact.file.name)
+                    ?.takeIf { publishableArtifact in it.builtBy }
                     ?.let {
                         signatures.remove(it)
                         return@configure
                     }
                 // Slow path just in case
                 signatures.removeIf { publishableArtifact in it.builtBy }
             }
-            val artifact = artifacts.remove(publishableArtifact)
             publication.removeDerivedArtifact(artifact)
         }
     }