fix: avoid failure when index restore misses layer-..json file

burrunan · Feb 18, 2023 · 9e8edc8 · 9e8edc8
1 parent bba2c1b
commit 9e8edc8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/layered-cache/src/main/kotlin/com/github/burrunan/gradle/cache/LayeredCache.kt b/layered-cache/src/main/kotlin/com/github/burrunan/gradle/cache/LayeredCache.kt
@@ -19,6 +19,7 @@ import actions.cache.RestoreType
 import actions.core.ActionFailedException
 import actions.core.debug
 import actions.core.info
+import actions.core.warning
 import actions.glob.removeFiles
 import com.github.burrunan.formatBytes
 import com.github.burrunan.gradle.github.stateVariable
@@ -60,6 +61,9 @@ class LayeredCache(
         paths = listOf(layers.cachedName),
     )
 
+    override fun toString(): String =
+        "Cache $name, primaryKey=$primaryKey, restoreKeys=$restoreKeys, "
+
     private fun CacheLayer.toCache(stateKey: String) =
         DefaultCache(
             name = name,
@@ -83,7 +87,10 @@ class LayeredCache(
         if (indexRestoreType == RestoreType.None) {
             return RestoreType.None
         }
-        val cacheIndex = layers.decode() ?: throw ActionFailedException("${layers.cachedName} is not found")
+        val cacheIndex = layers.decode() ?: run {
+            warning("Unable to restore cache $this")
+            return RestoreType.Unknown
+        }
 
         var restoreType: RestoreType = when (indexRestoreType) {
             is RestoreType.Exact -> RestoreType.Exact(indexRestoreType.path.removePrefix("$version-index-"))

diff --git a/wrappers/actions-core/src/main/kotlin/actions/core/ActionFailedException.kt b/wrappers/actions-core/src/main/kotlin/actions/core/ActionFailedException.kt
@@ -16,6 +16,5 @@
 
 package actions.core
 
-class ActionFailedException(override val message: String, cause: Throwable?): Throwable(message, cause) {
-    constructor(message: String): this(message, null)
-}
+class ActionFailedException(override val message: String, cause: Throwable? = null) :
+    Throwable(message, cause)