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 · de2e29e · de2e29e
1 parent 1b74709
commit de2e29e
Showing 1 changed file with 13 additions and 11 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,18 +96,20 @@ abstract class SigstoreSignExtension(private val project: Project) {
         }
         publication.whenPublishableArtifactRemoved {
             val publishableArtifact = this
-            signTask.configure {
-                signatures.findByName(file.name)
-                    ?.takeIf { publishableArtifact in it.builtBy  }
-                    ?.let {
-                        signatures.remove(it)
-                        return@configure
-                    }
-                // Slow path just in case
-                signatures.removeIf { publishableArtifact in it.builtBy }
+            // Ignore artifacts that we have not added a signature for
+            artifacts.remove(publishableArtifact)?.also {
+                signTask.configure {
+                    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 }
+                }
+                publication.removeDerivedArtifact(it)
             }
-            val artifact = artifacts.remove(publishableArtifact)
-            publication.removeDerivedArtifact(artifact)
         }
     }
 }