Improve CI feedback when directory is missing (#10608)

* Improve CI feedback when directory is missing As motivated by https://github.com/enso-org/enso/actions/runs/10006095519/job/27658100782?pr=10577#step:7:2277 * update codeowners * nit
enso-org · Oct 9, 2024 · 7f5c0e6 · 7f5c0e6
1 parent 7c51240
commit 7f5c0e6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -20,7 +20,10 @@ Cargo.toml
 /tools/build-performance/ @kazcw @Akirathan
 
 # Scala Libraries
-/lib/scala/ @4e6 @jaroslavtulach @hubertp
+/lib/scala/ @4e6 @jaroslavtulach @hubertp @Akirathan
+
+# Java libraries
+/lib/java/ @4e6 @jaroslavtulach @hubertp @Akirathan
 
 # GUI
 /app/gui2/ @Frizi @farmaazon @vitvakatu @kazcw @AdRiley

diff --git a/...anguage-server/src/test/scala/org/enso/languageserver/websocket/json/VcsManagerTest.scala b/...anguage-server/src/test/scala/org/enso/languageserver/websocket/json/VcsManagerTest.scala
@@ -1478,7 +1478,9 @@ class VcsManagerTest
         .setBare(false)
         .call()
 
-    path.toPath.resolve(".git").toFile.delete() shouldBe true
+    val gitPath = path.toPath.resolve(".git")
+    val deleted = gitPath.toFile.delete()
+    (deleted || !gitPath.toFile.exists()) shouldBe true
 
     val client = getInitialisedWsClient()
     jgit

diff --git a/engine/launcher/src/main/scala/org/enso/launcher/project/ProjectManager.scala b/engine/launcher/src/main/scala/org/enso/launcher/project/ProjectManager.scala
@@ -33,15 +33,15 @@ class ProjectManager {
     */
   def findProject(path: Path): Try[Option[Project]] =
     tryFindingProject(path.toAbsolutePath.normalize).map(Some(_)).recover {
-      case PackageManager.PackageNotFound() => None
+      case PackageManager.PackageNotFound(_) => None
     }
 
   private def tryFindingProject(root: Path): Try[Project] =
     packageManager
       .loadPackage(root.toFile)
       .map(new Project(_))
       .recoverWith {
-        case PackageManager.PackageNotFound() if root.getParent != null =>
+        case PackageManager.PackageNotFound(_) if root.getParent != null =>
           tryFindingProject(root.getParent)
         case otherError => Failure(otherError)
       }

diff --git a/engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala b/engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala
@@ -608,7 +608,7 @@ private class DefaultPackageRepository(
       Using(file.newBufferedReader) { reader =>
         StringUtils.join(reader.lines().iterator(), "\n")
       }
-    else Failure(PackageManager.PackageNotFound())
+    else Failure(PackageManager.PackageNotFound("manifest"))
   }
 
   override def shutdown(): Unit = {

diff --git a/lib/scala/pkg/src/main/scala/org/enso/pkg/Package.scala b/lib/scala/pkg/src/main/scala/org/enso/pkg/Package.scala
@@ -326,19 +326,16 @@ class PackageManager[F](implicit val fileSystem: FileSystem[F]) {
     */
   def loadPackage(root: F): Try[Package[F]] = {
     val result =
-      if (!root.exists) Failure(PackageManager.PackageNotFound())
+      if (!root.exists) Failure(PackageManager.PackageNotFound("root"))
       else {
-        def readConfig(file: F): Try[Config] =
-          if (file.exists)
-            Using(file.newBufferedReader)(Config.fromYaml).flatten
-          else Failure(PackageManager.PackageNotFound())
-
         val configFile = root.getChild(Package.configFileName)
         if (configFile.exists) {
           for {
-            result <- readConfig(configFile)
+            result <- Using(configFile.newBufferedReader)(
+              Config.fromYaml
+            ).flatten
           } yield new Package(root, result, fileSystem)
-        } else Failure(PackageManager.PackageNotFound())
+        } else Failure(PackageManager.PackageNotFound("config"))
       }
     result.recoverWith {
       case packageLoadingException: PackageManager.PackageLoadingException =>
@@ -570,8 +567,11 @@ object PackageManager {
   }
 
   /** The error indicating that the requested package does not exist. */
-  case class PackageNotFound()
-      extends PackageLoadingException(s"The package file does not exist.", null)
+  case class PackageNotFound(kind: String)
+      extends PackageLoadingException(
+        s"The $kind package file does not exist.",
+        null
+      )
 
   /** The error indicating that the package exists, but cannot be loaded. */
   case class PackageLoadingFailure(message: String, cause: Throwable)