From edccb5df998aaa0ab5035ef733d290ae6fd9be18 Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Thu, 21 Sep 2023 20:07:37 +0300 Subject: [PATCH 01/12] feat: open project using the packaged language server --- .../protocol/json/JsonConnectionController.scala | 6 +++++- .../org/enso/languageserver/session/SessionApi.scala | 6 +++++- .../config/GlobalConfigurationManager.scala | 6 +++--- .../languageserver/HeartbeatSession.scala | 4 ++-- .../requesthandler/ProjectCreateHandler.scala | 2 +- .../enso/projectmanager/service/ProjectService.scala | 12 ++++++------ 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/protocol/json/JsonConnectionController.scala b/engine/language-server/src/main/scala/org/enso/languageserver/protocol/json/JsonConnectionController.scala index 38a59e914194..2a82b5278b87 100644 --- a/engine/language-server/src/main/scala/org/enso/languageserver/protocol/json/JsonConnectionController.scala +++ b/engine/language-server/src/main/scala/org/enso/languageserver/protocol/json/JsonConnectionController.scala @@ -259,7 +259,11 @@ class JsonConnectionController( receiver ! ResponseResult( InitProtocolConnection, request.id, - InitProtocolConnection.Result(allRoots.map(_.toContentRoot).toSet) + InitProtocolConnection.Result( + buildinfo.Info.ensoVersion, + buildinfo.Info.currentEdition, + allRoots.map(_.toContentRoot).toSet + ) ) initialize(webActor, rpcSession) diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/session/SessionApi.scala b/engine/language-server/src/main/scala/org/enso/languageserver/session/SessionApi.scala index 4ccf0d6c9fab..e20a13612c94 100644 --- a/engine/language-server/src/main/scala/org/enso/languageserver/session/SessionApi.scala +++ b/engine/language-server/src/main/scala/org/enso/languageserver/session/SessionApi.scala @@ -16,7 +16,11 @@ object SessionApi { case class Params(clientId: UUID) - case class Result(contentRoots: Set[ContentRoot]) + case class Result( + ensoVersion: String, + currentEdition: String, + contentRoots: Set[ContentRoot] + ) implicit val hasParams: HasParams.Aux[this.type, InitProtocolConnection.Params] = diff --git a/lib/scala/distribution-manager/src/main/scala/org/enso/distribution/config/GlobalConfigurationManager.scala b/lib/scala/distribution-manager/src/main/scala/org/enso/distribution/config/GlobalConfigurationManager.scala index dcff3dec66a8..88e8260468ae 100644 --- a/lib/scala/distribution-manager/src/main/scala/org/enso/distribution/config/GlobalConfigurationManager.scala +++ b/lib/scala/distribution-manager/src/main/scala/org/enso/distribution/config/GlobalConfigurationManager.scala @@ -82,7 +82,7 @@ object GlobalConfigurationManager { val globalConfigName: String = "global-config.yaml" /** Tries to read the global config from the given `path`. */ - def readConfig(path: Path): Try[GlobalConfig] = + private def readConfig(path: Path): Try[GlobalConfig] = Using(Files.newBufferedReader(path)) { reader => for { json <- yaml.parser.parse(reader) @@ -91,7 +91,7 @@ object GlobalConfigurationManager { }.flatMap(_.toTry) /** Tries to write the provided `config` to the given `path`. */ - def writeConfig(path: Path, config: GlobalConfig): Try[Unit] = + private def writeConfig(path: Path, config: GlobalConfig): Try[Unit] = writeConfigRaw(path, GlobalConfig.encoder(config)) /** Tries to write the config from a raw JSON value to the given `path`. @@ -99,7 +99,7 @@ object GlobalConfigurationManager { * The config will not be saved if it is invalid, instead an exception is * thrown. */ - def writeConfigRaw(path: Path, rawConfig: Json): Try[Unit] = { + private def writeConfigRaw(path: Path, rawConfig: Json): Try[Unit] = { def verifyConfig: Try[Unit] = rawConfig.as[GlobalConfig] match { case Left(failure) => diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/HeartbeatSession.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/HeartbeatSession.scala index 5459728b8dd4..07ceacf0ab4a 100644 --- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/HeartbeatSession.scala +++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/HeartbeatSession.scala @@ -169,13 +169,13 @@ class HeartbeatSession( if (quietErrors) { logger.debug(s"$message ($throwable)", arg) } else { - logger.error(s"$message {}", arg, throwable.getMessage) + logger.error(s"$message {}", arg, throwable) } } private def logError(throwable: Throwable, message: String): Unit = { if (quietErrors) { - logger.debug(s"$message ($throwable)") + logger.debug(s"$message (${throwable.getMessage})") } else { logger.error(message, throwable) } diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/requesthandler/ProjectCreateHandler.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/requesthandler/ProjectCreateHandler.scala index 4ce85d7154a6..e6197dabc9f2 100644 --- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/requesthandler/ProjectCreateHandler.scala +++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/requesthandler/ProjectCreateHandler.scala @@ -76,7 +76,7 @@ object ProjectCreateHandler { /** Creates a configuration object used to create a [[ProjectCreateHandler]]. * - * @param configurationService + * @param configurationService a global configuration service * @param projectService a project service * @param requestTimeout a request timeout * @param timeoutRetries a number of timeouts to wait until a failure is reported diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectService.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectService.scala index 9ea5aa57c2ff..a78c1a3c2e4a 100644 --- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectService.scala +++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectService.scala @@ -280,10 +280,12 @@ class ProjectService[ openTime <- clock.nowInUtc() updated = project.copy(lastOpened = Some(openTime)) _ <- repo.update(updated).mapError(toServiceFailure) + projectWithDefaultEdition = + project.copy(edition = Some(DefaultEdition.getDefaultEdition)) sockets <- startServer( progressTracker, clientId, - updated, + projectWithDefaultEdition, missingComponentAction ) } yield sockets @@ -315,6 +317,7 @@ class ProjectService[ project: Project, missingComponentAction: MissingComponentAction ): F[ProjectServiceFailure, RunningLanguageServerInfo] = for { + _ <- log.debug("Preparing to start the Language Server for [{}].", project) version <- resolveProjectVersion(project) _ <- preinstallEngine(progressTracker, version, missingComponentAction) sockets <- languageServerGateway @@ -322,17 +325,14 @@ class ProjectService[ .mapError { case PreviousInstanceNotShutDown => ProjectOpenFailed( - "The previous instance of the Language Server hasn't been shut " + - "down yet." + "The previous instance of the Language Server hasn't been shut down yet." ) case ServerBootTimedOut => ProjectOpenFailed("Language server boot timed out.") case ServerBootFailed(th) => - ProjectOpenFailed( - s"Language server boot failed. ${th.getMessage}" - ) + ProjectOpenFailed(s"Language server boot failed. ${th.getMessage}") } } yield RunningLanguageServerInfo( version, From 5367fa3dcc5c07d5c5dbec850ed76f83103a980f Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Fri, 22 Sep 2023 17:50:30 +0300 Subject: [PATCH 02/12] Update lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/HeartbeatSession.scala Co-authored-by: Hubert Plociniczak --- .../infrastructure/languageserver/HeartbeatSession.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/HeartbeatSession.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/HeartbeatSession.scala index 07ceacf0ab4a..ea2d105f4bbb 100644 --- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/HeartbeatSession.scala +++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/HeartbeatSession.scala @@ -175,7 +175,7 @@ class HeartbeatSession( private def logError(throwable: Throwable, message: String): Unit = { if (quietErrors) { - logger.debug(s"$message (${throwable.getMessage})") + logger.debug(s"$message ({})", throwable.getMessage) } else { logger.error(message, throwable) } From 813958fb0c00e5c851de5f9ecf1bb46c2fefdcd6 Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Fri, 22 Sep 2023 22:21:45 +0300 Subject: [PATCH 03/12] test: pending project open test --- .../enso/projectmanager/protocol/MissingComponentBehavior.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/MissingComponentBehavior.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/MissingComponentBehavior.scala index 910e12eeca47..e06bff123b1b 100644 --- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/MissingComponentBehavior.scala +++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/MissingComponentBehavior.scala @@ -42,6 +42,7 @@ trait MissingComponentBehavior { "fail if the requested missing version is marked as broken with " + "Install" in { + pending // #7750 val client = new WsTestClient(address) client.send(buildRequest(brokenVersion, MissingComponentAction.Install)) client.expectError(4021) From 2117f537e460037a6e01c34e240c8ad439baa16c Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Mon, 25 Sep 2023 17:57:32 +0300 Subject: [PATCH 04/12] feat: skip unnecessary version resolving --- .../engine-protocol/src/project_manager.rs | 66 +++++------- app/gui/src/ide/initializer.rs | 9 +- .../projectmanager/data/ProjectMetadata.scala | 5 - .../service/ProjectService.scala | 101 +++++++----------- 4 files changed, 73 insertions(+), 108 deletions(-) diff --git a/app/gui/controller/engine-protocol/src/project_manager.rs b/app/gui/controller/engine-protocol/src/project_manager.rs index 386936281ebf..43d8da11e1a1 100644 --- a/app/gui/controller/engine-protocol/src/project_manager.rs +++ b/app/gui/controller/engine-protocol/src/project_manager.rs @@ -172,15 +172,13 @@ impl From for ImString { #[serde(rename_all = "camelCase")] pub struct ProjectMetadata { /// Project's name. - pub name: ProjectName, + pub name: ProjectName, /// Project's namespace, - pub namespace: String, + pub namespace: String, /// Project's uuid. - pub id: Uuid, - /// Engine version to use for the project, represented by a semver version string. - pub engine_version: Option, + pub id: Uuid, /// Last time the project was opened. - pub last_opened: Option, + pub last_opened: Option, } /// This type specifies what action should be taken if an Engine's component required to complete @@ -319,33 +317,29 @@ mod mock_client_tests { fn list_projects() { let mock_client = MockClient::default(); let project1 = ProjectMetadata { - name: ProjectName::new_unchecked("project1"), - id: Uuid::default(), - last_opened: Some(DateTime::parse_from_rfc3339("2020-01-07T21:25:26Z").unwrap()), - engine_version: Some("0.2.21".to_owned()), - namespace: "local".to_owned(), + name: ProjectName::new_unchecked("project1"), + id: Uuid::default(), + last_opened: Some(DateTime::parse_from_rfc3339("2020-01-07T21:25:26Z").unwrap()), + namespace: "local".to_owned(), }; let project2 = ProjectMetadata { - name: ProjectName::new_unchecked("project2"), - id: Uuid::default(), - last_opened: Some(DateTime::parse_from_rfc3339("2020-02-02T13:15:20Z").unwrap()), - engine_version: Some("0.2.22".to_owned()), - namespace: "local".to_owned(), + name: ProjectName::new_unchecked("project2"), + id: Uuid::default(), + last_opened: Some(DateTime::parse_from_rfc3339("2020-02-02T13:15:20Z").unwrap()), + namespace: "local".to_owned(), }; let expected_recent_projects = response::ProjectList { projects: vec![project1, project2] }; let sample1 = ProjectMetadata { - name: ProjectName::new_unchecked("sample1"), - id: Uuid::default(), - last_opened: Some(DateTime::parse_from_rfc3339("2019-11-23T05:30:12Z").unwrap()), - engine_version: Some("0.2.21".to_owned()), - namespace: "test".to_owned(), + name: ProjectName::new_unchecked("sample1"), + id: Uuid::default(), + last_opened: Some(DateTime::parse_from_rfc3339("2019-11-23T05:30:12Z").unwrap()), + namespace: "test".to_owned(), }; let sample2 = ProjectMetadata { - name: ProjectName::new_unchecked("sample2"), - id: Uuid::default(), - last_opened: Some(DateTime::parse_from_rfc3339("2019-12-25T00:10:58Z").unwrap()), - engine_version: Some("0.2.21".to_owned()), - namespace: "test".to_owned(), + name: ProjectName::new_unchecked("sample2"), + id: Uuid::default(), + last_opened: Some(DateTime::parse_from_rfc3339("2019-12-25T00:10:58Z").unwrap()), + namespace: "test".to_owned(), }; let expected_sample_projects = response::ProjectList { projects: vec![sample1, sample2] }; expect_call!(mock_client.list_projects(count=Some(2)) => @@ -483,18 +477,16 @@ mod remote_client_tests { let number_of_projects_json = json!({ "numberOfProjects": number_of_projects }); let num_projects_json = json!({ "numProjects": number_of_projects }); let project1 = ProjectMetadata { - name: ProjectName::new_unchecked("project1"), - id: Uuid::default(), - last_opened: Some(DateTime::parse_from_rfc3339("2020-01-07T21:25:26Z").unwrap()), - engine_version: Some("0.2.21".to_owned()), - namespace: "local".to_owned(), + name: ProjectName::new_unchecked("project1"), + id: Uuid::default(), + last_opened: Some(DateTime::parse_from_rfc3339("2020-01-07T21:25:26Z").unwrap()), + namespace: "local".to_owned(), }; let project2 = ProjectMetadata { - name: ProjectName::new_unchecked("project2"), - id: Uuid::default(), - last_opened: Some(DateTime::parse_from_rfc3339("2020-02-02T13:15:20Z").unwrap()), - engine_version: Some("0.2.22".to_owned()), - namespace: "local".to_owned(), + name: ProjectName::new_unchecked("project2"), + id: Uuid::default(), + last_opened: Some(DateTime::parse_from_rfc3339("2020-02-02T13:15:20Z").unwrap()), + namespace: "local".to_owned(), }; let project_list = response::ProjectList { projects: vec![project1, project2] }; let project_list_json = json!({ @@ -503,14 +495,12 @@ mod remote_client_tests { "id" : "00000000-0000-0000-0000-000000000000", "lastOpened" : "2020-01-07T21:25:26+00:00", "name" : "project1", - "engineVersion" : "0.2.21", "namespace" : "local" }, { "id" : "00000000-0000-0000-0000-000000000000", "lastOpened" : "2020-02-02T13:15:20+00:00", "name" : "project2", - "engineVersion" : "0.2.22", "namespace" : "local" } ] diff --git a/app/gui/src/ide/initializer.rs b/app/gui/src/ide/initializer.rs index 624fbfd223e5..0156d9c55189 100644 --- a/app/gui/src/ide/initializer.rs +++ b/app/gui/src/ide/initializer.rs @@ -298,11 +298,10 @@ mod test { let mock_client = project_manager::MockClient::default(); let project_name = ProjectName::new_unchecked("TestProject"); let project = project_manager::ProjectMetadata { - name: project_name.clone(), - id: uuid::Uuid::new_v4(), - last_opened: default(), - engine_version: Some("127.0.01".to_owned()), - namespace: "local".to_owned(), + name: project_name.clone(), + id: Uuid::new_v4(), + last_opened: default(), + namespace: "local".to_owned(), }; let expected_id = project.id; let projects = vec![project]; diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/data/ProjectMetadata.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/data/ProjectMetadata.scala index 67562a37daf8..6c7ac49643d1 100644 --- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/data/ProjectMetadata.scala +++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/data/ProjectMetadata.scala @@ -3,15 +3,11 @@ package org.enso.projectmanager.data import java.time.OffsetDateTime import java.util.UUID -import nl.gn0s1s.bump.SemVer - /** Contains project metadata. * * @param name the name of the project * @param namespace the namespace of the project * @param id the project id - * @param engineVersion version of the engine associated with the project, it - * may be missing if project's edition could not be loaded * @param created the project creation time * @param lastOpened the last opened datetime */ @@ -19,7 +15,6 @@ case class ProjectMetadata( name: String, namespace: String, id: UUID, - engineVersion: Option[SemVer], created: OffsetDateTime, lastOpened: Option[OffsetDateTime] ) diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectService.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectService.scala index a78c1a3c2e4a..4c24bcdf8017 100644 --- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectService.scala +++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectService.scala @@ -8,11 +8,7 @@ import org.enso.editions.DefaultEdition import org.enso.pkg.Config import org.enso.pkg.validation.NameValidation import org.enso.projectmanager.control.core.syntax._ -import org.enso.projectmanager.control.core.{ - Applicative, - CovariantFlatMap, - Traverse -} +import org.enso.projectmanager.control.core.CovariantFlatMap import org.enso.projectmanager.control.effect.syntax._ import org.enso.projectmanager.control.effect.{ErrorChannel, Sync} import org.enso.projectmanager.data.{ @@ -44,6 +40,7 @@ import org.enso.projectmanager.service.validation.ProjectNameValidator import org.enso.projectmanager.service.versionmanagement.RuntimeVersionManagerErrorRecoverySyntax._ import org.enso.projectmanager.service.versionmanagement.RuntimeVersionManagerFactory import org.enso.projectmanager.versionmanagement.DistributionConfiguration +import org.enso.runtimeversionmanager.CurrentVersion import java.util.UUID @@ -58,7 +55,7 @@ import java.util.UUID * @param gen a random generator */ class ProjectService[ - F[+_, +_]: Sync: ErrorChannel: CovariantFlatMap: Applicative + F[+_, +_]: Sync: ErrorChannel: CovariantFlatMap ]( validator: ProjectNameValidator[F], repo: ProjectRepository[F], @@ -281,7 +278,7 @@ class ProjectService[ updated = project.copy(lastOpened = Some(openTime)) _ <- repo.update(updated).mapError(toServiceFailure) projectWithDefaultEdition = - project.copy(edition = Some(DefaultEdition.getDefaultEdition)) + updated.copy(edition = Some(DefaultEdition.getDefaultEdition)) sockets <- startServer( progressTracker, clientId, @@ -369,36 +366,15 @@ class ProjectService[ .take(maybeSize.getOrElse(Int.MaxValue)) ) .mapError(toServiceFailure) - .flatMap(xs => Traverse[List].traverse(xs)(resolveProjectMetadata)) - - private def resolveProjectMetadata( - project: Project - ): F[ProjectServiceFailure, ProjectMetadata] = { - val version = resolveProjectVersion(project) - for { - version <- version.map(Some(_)).recover { error => - // TODO [RW] We may consider sending this warning to the IDE once - // a warning protocol is implemented (#1860). - logger.warn( - s"Could not resolve engine version for project ${project.name}: " + - s"$error" - ) - None - } - } yield toProjectMetadata(version, project) - } + .map(_.map(toProjectMetadata)) - private def toProjectMetadata( - engineVersion: Option[SemVer], - project: Project - ): ProjectMetadata = + private def toProjectMetadata(project: Project): ProjectMetadata = ProjectMetadata( - name = project.name, - namespace = project.namespace, - id = project.id, - engineVersion = engineVersion, - created = project.created, - lastOpened = project.lastOpened + name = project.name, + namespace = project.namespace, + id = project.id, + created = project.created, + lastOpened = project.lastOpened ) private def getUserProject( @@ -464,31 +440,36 @@ class ProjectService[ private def resolveProjectVersion( project: Project ): F[ProjectServiceFailure, SemVer] = - Sync[F] - .blockingOp { - // TODO [RW] at some point we will need to use the configuration service to get the actual default version, see #1864 - val _ = configurationService - - val edition = - project.edition.getOrElse(DefaultEdition.getDefaultEdition) - - distributionConfiguration.editionManager - .resolveEngineVersion(edition) - .orElse { - logger.warn( - s"Could not resolve engine version for ${edition}. Falling " + - s"back to ${DefaultEdition.getDefaultEdition}" - ) - distributionConfiguration.editionManager - .resolveEngineVersion(DefaultEdition.getDefaultEdition) - } - .get - } - .mapError { error => - ProjectServiceFailure.GlobalConfigurationAccessFailure( - s"Could not resolve project engine version: ${error.getMessage}" - ) - } + if (project.edition.contains(DefaultEdition.getDefaultEdition)) { + CovariantFlatMap[F].pure(CurrentVersion.version) + } else { + Sync[F] + .blockingOp { + // TODO [RW] at some point we will need to use the configuration service to get the actual default version, see #1864 + val _ = configurationService + + val edition = + project.edition.getOrElse(DefaultEdition.getDefaultEdition) + + distributionConfiguration.editionManager + .resolveEngineVersion(edition) + .orElse { + logger.warn( + s"Could not resolve engine version for [{}]. Falling back to [{}].", + edition, + DefaultEdition.getDefaultEdition + ) + distributionConfiguration.editionManager + .resolveEngineVersion(DefaultEdition.getDefaultEdition) + } + .get + } + .mapError { error => + ProjectServiceFailure.GlobalConfigurationAccessFailure( + s"Could not resolve project engine version: ${error.getMessage}" + ) + } + } private def getNameForNewProject( projectName: String, From aa84370832b397fffc60b51a7f0ea01697c34007 Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Tue, 26 Sep 2023 17:36:10 +0300 Subject: [PATCH 05/12] fix: project-manager tests --- .../protocol/EngineManagementApiSpec.scala | 7 ++++-- .../protocol/ProjectManagementApiSpec.scala | 23 ++++--------------- .../protocol/ProjectShutdownSpec.scala | 4 ++-- .../enso/enso-0.0.0-dev/manifest.yaml | 13 +++++++++++ 4 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/manifest.yaml diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/EngineManagementApiSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/EngineManagementApiSpec.scala index 80915e2219e2..274f366f01c5 100644 --- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/EngineManagementApiSpec.scala +++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/EngineManagementApiSpec.scala @@ -11,7 +11,8 @@ class EngineManagementApiSpec extends BaseServerSpec with FlakySpec { "engine/*" must { "report no installed engines by default" in { - implicit val client = new WsTestClient(address) + implicit val client: WsTestClient = new WsTestClient(address) + client.send(json""" { "jsonrpc": "2.0", "method": "engine/list-installed", @@ -48,7 +49,9 @@ class EngineManagementApiSpec extends BaseServerSpec with FlakySpec { {"version": "0.0.3", "markedAsBroken": false}, {"version": "0.0.1", "markedAsBroken": false}, {"version": "0.0.1-pre", "markedAsBroken": false}, - {"version": "0.0.0", "markedAsBroken": false} + {"version": "0.0.1-dev", "markedAsBroken": false}, + {"version": "0.0.0", "markedAsBroken": false}, + {"version": "0.0.0-dev", "markedAsBroken": false} ] } } diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectManagementApiSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectManagementApiSpec.scala index 40676d045308..d7015fd3c360 100644 --- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectManagementApiSpec.scala +++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectManagementApiSpec.scala @@ -2,16 +2,16 @@ package org.enso.projectmanager.protocol import akka.testkit.TestDuration import io.circe.literal._ -import nl.gn0s1s.bump.SemVer import org.apache.commons.io.FileUtils -import org.enso.editions.SemVerJson._ import org.enso.projectmanager.boot.configuration.TimeoutConfig import org.enso.projectmanager.{BaseServerSpec, ProjectManagementOps} +import org.enso.runtimeversionmanager.CurrentVersion import org.enso.testkit.FlakySpec import java.io.File import java.nio.file.{Files, Paths} import java.util.UUID + import scala.concurrent.duration._ import scala.io.Source @@ -25,7 +25,7 @@ class ProjectManagementApiSpec gen.reset() } - override val engineToInstall = Some(SemVer(0, 0, 1)) + override val engineToInstall = Some(CurrentVersion.version) override val deleteProjectsRootAfterEachTest = false @@ -295,7 +295,7 @@ class ProjectManagementApiSpec "id": 1, "params": { "name": "Foo", - "version": "0.0.1" + "version": ${CurrentVersion.version.toString()} } } """) @@ -445,7 +445,7 @@ class ProjectManagementApiSpec """) val result = openProjectData result.projectName shouldEqual projectName - result.engineVersion shouldEqual SemVer("0.0.1").get + result.engineVersion shouldEqual CurrentVersion.version // teardown closeProject(projectId) @@ -660,7 +660,6 @@ class ProjectManagementApiSpec "name": "Foo", "namespace": "local", "id": $projectId1, - "engineVersion": $engineToInstall, "created": $projectCreationTime, "lastOpened": $projectOpenTime }, @@ -668,7 +667,6 @@ class ProjectManagementApiSpec "name": "Foo", "namespace": "local", "id": $projectId2, - "engineVersion": $engineToInstall, "created": $projectCreationTime, "lastOpened": null } @@ -773,7 +771,6 @@ class ProjectManagementApiSpec "name": "Baz", "namespace": "local", "id": $bazId, - "engineVersion": $engineToInstall, "created": $projectBazCreationTime, "lastOpened": null }, @@ -781,7 +778,6 @@ class ProjectManagementApiSpec "name": "Bar", "namespace": "local", "id": $barId, - "engineVersion": $engineToInstall, "created": $projectBarCreationTime, "lastOpened": null }, @@ -789,7 +785,6 @@ class ProjectManagementApiSpec "name": "Foo", "namespace": "local", "id": $fooId, - "engineVersion": $engineToInstall, "created": $projectFooCreationTime, "lastOpened": null } @@ -836,7 +831,6 @@ class ProjectManagementApiSpec "name": "Bar", "namespace": "local", "id": $barId, - "engineVersion": $engineToInstall, "created": $projectBarCreationTime, "lastOpened": null }, @@ -844,7 +838,6 @@ class ProjectManagementApiSpec "name": "Foo", "namespace": "local", "id": $fooId, - "engineVersion": $engineToInstall, "created": $projectFooCreationTime, "lastOpened": null } @@ -895,7 +888,6 @@ class ProjectManagementApiSpec "name": "Quux", "namespace": "local", "id": $quuxId, - "engineVersion": $engineToInstall, "created": $projectQuuxCreationTime, "lastOpened": null }, @@ -903,7 +895,6 @@ class ProjectManagementApiSpec "name": "Baz", "namespace": "local", "id": $bazId, - "engineVersion": $engineToInstall, "created": $creationTime, "lastOpened": $bazOpenTime }, @@ -911,7 +902,6 @@ class ProjectManagementApiSpec "name": "Bar", "namespace": "local", "id": $barId, - "engineVersion": $engineToInstall, "created": $creationTime, "lastOpened": $barOpenTime }, @@ -919,7 +909,6 @@ class ProjectManagementApiSpec "name": "Foo", "namespace": "local", "id": $fooId, - "engineVersion": $engineToInstall, "created": $creationTime, "lastOpened": null } @@ -968,7 +957,6 @@ class ProjectManagementApiSpec "name": "Foo", "namespace": "local", "id": $projectId1, - "engineVersion": $engineToInstall, "created": $creationTime, "lastOpened": null }, @@ -976,7 +964,6 @@ class ProjectManagementApiSpec "name": "Foo", "namespace": "local", "id": $projectId2, - "engineVersion": $engineToInstall, "created": $creationTime, "lastOpened": null } diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectShutdownSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectShutdownSpec.scala index 021399e728f0..e9ab364bbd73 100644 --- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectShutdownSpec.scala +++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectShutdownSpec.scala @@ -2,7 +2,6 @@ package org.enso.projectmanager.protocol import akka.actor.ActorRef import io.circe.literal._ -import nl.gn0s1s.bump.SemVer import org.enso.jsonrpc.ClientControllerFactory import org.enso.projectmanager.boot.configuration.TimeoutConfig import org.enso.projectmanager.event.ClientEvent.ClientDisconnected @@ -10,6 +9,7 @@ import zio.{ZAny, ZIO} import java.util.UUID import org.enso.projectmanager.{BaseServerSpec, ProjectManagementOps} +import org.enso.runtimeversionmanager.CurrentVersion import org.enso.testkit.FlakySpec import scala.concurrent.duration._ @@ -24,7 +24,7 @@ class ProjectShutdownSpec gen.reset() } - override val engineToInstall = Some(SemVer(0, 0, 1)) + override val engineToInstall = Some(CurrentVersion.version) override val deleteProjectsRootAfterEachTest = false diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/manifest.yaml b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/manifest.yaml new file mode 100644 index 000000000000..8900af309a5d --- /dev/null +++ b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/manifest.yaml @@ -0,0 +1,13 @@ +minimum-launcher-version: 0.0.0-dev +minimum-project-manager-version: 0.0.0-dev +graal-vm-version: 1.0.0 +graal-java-version: 11 +jvm-options: + - value: "-Dtruffle.class.path.append=$enginePackagePath\\component\\runtime.jar" + os: "windows" + - value: "-Dtruffle.class.path.append=$enginePackagePath/component/runtime.jar" + os: "linux" + - value: "-Dtruffle.class.path.append=$enginePackagePath/component/runtime.jar" + os: "macos" + - value: "-Doptions-added-from-manifest=42" + - value: "-Denso.version.override=0.0.0-dev" From 04f21a459ce2d18b0fd368dadaf83f0f577bab7b Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Tue, 26 Sep 2023 20:21:57 +0300 Subject: [PATCH 06/12] fix: LanguageServerGatewaySpec --- .../languageserver/LanguageServerGatewaySpec.scala | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala index 9279c9e1af1d..5c1d5455e753 100644 --- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala +++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala @@ -1,26 +1,23 @@ package org.enso.projectmanager.infrastructure.languageserver import akka.testkit.TestDuration -import nl.gn0s1s.bump.SemVer import io.circe.literal._ import org.enso.projectmanager.test.Net._ import org.enso.projectmanager.{BaseServerSpec, ProjectManagementOps} -import org.enso.testkit.{FlakySpec, RetrySpec} +import org.enso.runtimeversionmanager.CurrentVersion import scala.concurrent.Await import scala.concurrent.duration._ class LanguageServerGatewaySpec extends BaseServerSpec - with FlakySpec - with ProjectManagementOps - with RetrySpec { + with ProjectManagementOps { - override val engineToInstall = Some(SemVer(0, 0, 1)) + override val engineToInstall = Some(CurrentVersion.version) "A language server service" must { - "kill all running language servers" taggedAs Retry ignore { + "kill all running language servers" ignore { implicit val client = new WsTestClient(address) val fooId = createProject("foo") val barId = createProject("bar") From 5de468d853f3eefe206b5c3ae4a1d24a6f81d01b Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Tue, 26 Sep 2023 21:00:25 +0300 Subject: [PATCH 07/12] fix: fake releases --- .../enso-0.0.0-dev/component/runner.jar | 2 ++ .../enso-0.0.0-dev/component/runtime.jar | 2 ++ .../enso-0.0.0-dev/component/runner.jar | 2 ++ .../enso-0.0.0-dev/component/runtime.jar | 2 ++ .../enso-0.0.0-dev/component/runner.jar | 2 ++ .../enso-0.0.0-dev/component/runtime.jar | 2 ++ 6 files changed, 12 insertions(+) create mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar create mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar create mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar create mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar create mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runner.jar create mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runtime.jar diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar new file mode 100644 index 000000000000..bb4b9533544b --- /dev/null +++ b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar @@ -0,0 +1,2 @@ +placeholder + diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar new file mode 100644 index 000000000000..bb4b9533544b --- /dev/null +++ b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar @@ -0,0 +1,2 @@ +placeholder + diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar new file mode 100644 index 000000000000..bb4b9533544b --- /dev/null +++ b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar @@ -0,0 +1,2 @@ +placeholder + diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar new file mode 100644 index 000000000000..bb4b9533544b --- /dev/null +++ b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar @@ -0,0 +1,2 @@ +placeholder + diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runner.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runner.jar new file mode 100644 index 000000000000..bb4b9533544b --- /dev/null +++ b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runner.jar @@ -0,0 +1,2 @@ +placeholder + diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runtime.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runtime.jar new file mode 100644 index 000000000000..bb4b9533544b --- /dev/null +++ b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runtime.jar @@ -0,0 +1,2 @@ +placeholder + From 1e76e3edc22232b6562114ff23f5b10a5a7ebc50 Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Wed, 27 Sep 2023 00:06:53 +0300 Subject: [PATCH 08/12] fix: engine management spec --- .../enso/projectmanager/protocol/EngineManagementApiSpec.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/EngineManagementApiSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/EngineManagementApiSpec.scala index 274f366f01c5..51cb949f61a3 100644 --- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/EngineManagementApiSpec.scala +++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/EngineManagementApiSpec.scala @@ -49,7 +49,6 @@ class EngineManagementApiSpec extends BaseServerSpec with FlakySpec { {"version": "0.0.3", "markedAsBroken": false}, {"version": "0.0.1", "markedAsBroken": false}, {"version": "0.0.1-pre", "markedAsBroken": false}, - {"version": "0.0.1-dev", "markedAsBroken": false}, {"version": "0.0.0", "markedAsBroken": false}, {"version": "0.0.0-dev", "markedAsBroken": false} ] From 9b6921a8661bfeedf92dc29ae34f73045c3a8cb0 Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Wed, 27 Sep 2023 19:21:44 +0300 Subject: [PATCH 09/12] misc: trigger rebuild From ae344d0c2ee57711fabe8415c86f81039f5ffbfd Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Thu, 28 Sep 2023 11:31:59 +0300 Subject: [PATCH 10/12] misc: debug --- .../languageserver/LanguageServerGatewaySpec.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala index 5c1d5455e753..481a85d64d15 100644 --- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala +++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala @@ -13,6 +13,8 @@ class LanguageServerGatewaySpec extends BaseServerSpec with ProjectManagementOps { + println(s"SETUP CurrentVersion.version=${CurrentVersion.version}") + override val engineToInstall = Some(CurrentVersion.version) "A language server service" must { @@ -42,6 +44,7 @@ class LanguageServerGatewaySpec } "report language server status" in { + println(s"CurrentVersion.version=${CurrentVersion.version}") implicit val client = new WsTestClient(address) val fooId = createProject("foo") //val fooSocket = From 93790c8fe9066eb62386a35b63b8abc8103c3bc8 Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Thu, 28 Sep 2023 13:18:02 +0300 Subject: [PATCH 11/12] misc: fake-release 2023.2.1-dev --- .../enso-2023.2.1-dev/component/runner.jar | 2 ++ .../enso-2023.2.1-dev/component/runtime.jar | 2 ++ .../enso-2023.2.1-dev/component/runner.jar | 2 ++ .../enso-2023.2.1-dev/component/runtime.jar | 2 ++ .../enso-2023.2.1-dev/component/runner.jar | 2 ++ .../enso-2023.2.1-dev/component/runtime.jar | 2 ++ .../enso/enso-2023.2.1-dev/manifest.yaml | 13 +++++++++++++ 7 files changed, 25 insertions(+) create mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar create mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar create mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar create mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar create mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runner.jar create mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runtime.jar create mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/manifest.yaml diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar new file mode 100644 index 000000000000..bb4b9533544b --- /dev/null +++ b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar @@ -0,0 +1,2 @@ +placeholder + diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar new file mode 100644 index 000000000000..bb4b9533544b --- /dev/null +++ b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar @@ -0,0 +1,2 @@ +placeholder + diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar new file mode 100644 index 000000000000..bb4b9533544b --- /dev/null +++ b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar @@ -0,0 +1,2 @@ +placeholder + diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar new file mode 100644 index 000000000000..bb4b9533544b --- /dev/null +++ b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar @@ -0,0 +1,2 @@ +placeholder + diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runner.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runner.jar new file mode 100644 index 000000000000..bb4b9533544b --- /dev/null +++ b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runner.jar @@ -0,0 +1,2 @@ +placeholder + diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runtime.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runtime.jar new file mode 100644 index 000000000000..bb4b9533544b --- /dev/null +++ b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runtime.jar @@ -0,0 +1,2 @@ +placeholder + diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/manifest.yaml b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/manifest.yaml new file mode 100644 index 000000000000..c82651177f10 --- /dev/null +++ b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/manifest.yaml @@ -0,0 +1,13 @@ +minimum-launcher-version: 0.0.0-dev +minimum-project-manager-version: 0.0.0-dev +graal-vm-version: 1.0.0 +graal-java-version: 11 +jvm-options: + - value: "-Dtruffle.class.path.append=$enginePackagePath\\component\\runtime.jar" + os: "windows" + - value: "-Dtruffle.class.path.append=$enginePackagePath/component/runtime.jar" + os: "linux" + - value: "-Dtruffle.class.path.append=$enginePackagePath/component/runtime.jar" + os: "macos" + - value: "-Doptions-added-from-manifest=42" + - value: "-Denso.version.override=2023.2.1-dev" From 676310559a3c03b6b3e48614c1e281612968a775 Mon Sep 17 00:00:00 2001 From: Dmitry Bushev Date: Thu, 28 Sep 2023 14:39:37 +0300 Subject: [PATCH 12/12] feat: override test version --- .../org/enso/projectmanager/BaseServerSpec.scala | 6 +++--- .../languageserver/LanguageServerGatewaySpec.scala | 9 +++++---- .../protocol/ProjectManagementApiSpec.scala | 7 ++++++- .../ProjectOpenHandleMissingRuntimeSpec.scala | 8 +++++++- .../protocol/ProjectOpenMissingComponentsSpec.scala | 9 ++++++++- .../protocol/ProjectShutdownSpec.scala | 8 ++++++-- .../enso-0.0.0-dev/component/runner.jar | 2 -- .../enso-0.0.0-dev/component/runtime.jar | 2 -- .../enso-0.0.0-dev/component/runner.jar | 2 -- .../enso-0.0.0-dev/component/runtime.jar | 2 -- .../enso-0.0.0-dev/component/runner.jar | 2 -- .../enso-0.0.0-dev/component/runtime.jar | 2 -- .../fake-releases/enso/enso-0.0.0-dev/manifest.yaml | 13 ------------- .../enso-2023.2.1-dev/component/runner.jar | 2 -- .../enso-2023.2.1-dev/component/runtime.jar | 2 -- .../enso-2023.2.1-dev/component/runner.jar | 2 -- .../enso-2023.2.1-dev/component/runtime.jar | 2 -- .../enso-2023.2.1-dev/component/runner.jar | 2 -- .../enso-2023.2.1-dev/component/runtime.jar | 2 -- .../enso/enso-2023.2.1-dev/manifest.yaml | 13 ------------- 20 files changed, 35 insertions(+), 62 deletions(-) delete mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar delete mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar delete mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar delete mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar delete mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runner.jar delete mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runtime.jar delete mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/manifest.yaml delete mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar delete mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar delete mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar delete mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar delete mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runner.jar delete mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runtime.jar delete mode 100644 lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/manifest.yaml diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/BaseServerSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/BaseServerSpec.scala index 041f056e33bd..3dd75aa44406 100644 --- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/BaseServerSpec.scala +++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/BaseServerSpec.scala @@ -43,6 +43,7 @@ import org.enso.projectmanager.service.versionmanagement.{ } import org.enso.projectmanager.service.{ProjectCreationService, ProjectService} import org.enso.projectmanager.test.{ObservableGenerator, ProgrammableClock} +import org.enso.runtimeversionmanager.CurrentVersion import org.enso.runtimeversionmanager.components.GraalVMVersion import org.enso.runtimeversionmanager.test.FakeReleases import org.scalatest.BeforeAndAfterAll @@ -248,9 +249,8 @@ class BaseServerSpec extends JsonRpcServerTestKit with BeforeAndAfterAll { } private def setupEditions(): Unit = { - val engineVersion = - engineToInstall.map(_.toString).getOrElse(buildinfo.Info.ensoVersion) - val editionsDir = testDistributionRoot.toPath / "test_data" / "editions" + val engineVersion = engineToInstall.getOrElse(CurrentVersion.version) + val editionsDir = testDistributionRoot.toPath / "test_data" / "editions" Files.createDirectories(editionsDir) val editionName = buildinfo.Info.currentEdition + ".yaml" val editionConfig = diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala index 481a85d64d15..73f66039e0bc 100644 --- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala +++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala @@ -2,20 +2,22 @@ package org.enso.projectmanager.infrastructure.languageserver import akka.testkit.TestDuration import io.circe.literal._ +import nl.gn0s1s.bump.SemVer import org.enso.projectmanager.test.Net._ import org.enso.projectmanager.{BaseServerSpec, ProjectManagementOps} -import org.enso.runtimeversionmanager.CurrentVersion +import org.enso.runtimeversionmanager.test.OverrideTestVersionSuite import scala.concurrent.Await import scala.concurrent.duration._ class LanguageServerGatewaySpec extends BaseServerSpec + with OverrideTestVersionSuite with ProjectManagementOps { - println(s"SETUP CurrentVersion.version=${CurrentVersion.version}") + override val testVersion: SemVer = SemVer(0, 0, 1) - override val engineToInstall = Some(CurrentVersion.version) + override val engineToInstall = Some(SemVer(0, 0, 1)) "A language server service" must { @@ -44,7 +46,6 @@ class LanguageServerGatewaySpec } "report language server status" in { - println(s"CurrentVersion.version=${CurrentVersion.version}") implicit val client = new WsTestClient(address) val fooId = createProject("foo") //val fooSocket = diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectManagementApiSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectManagementApiSpec.scala index d7015fd3c360..8852dfb87b70 100644 --- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectManagementApiSpec.scala +++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectManagementApiSpec.scala @@ -2,10 +2,12 @@ package org.enso.projectmanager.protocol import akka.testkit.TestDuration import io.circe.literal._ +import nl.gn0s1s.bump.SemVer import org.apache.commons.io.FileUtils import org.enso.projectmanager.boot.configuration.TimeoutConfig import org.enso.projectmanager.{BaseServerSpec, ProjectManagementOps} import org.enso.runtimeversionmanager.CurrentVersion +import org.enso.runtimeversionmanager.test.OverrideTestVersionSuite import org.enso.testkit.FlakySpec import java.io.File @@ -18,14 +20,17 @@ import scala.io.Source class ProjectManagementApiSpec extends BaseServerSpec with FlakySpec + with OverrideTestVersionSuite with ProjectManagementOps { + override val testVersion: SemVer = SemVer(0, 0, 1) + override def beforeEach(): Unit = { super.beforeEach() gen.reset() } - override val engineToInstall = Some(CurrentVersion.version) + override val engineToInstall = Some(SemVer(0, 0, 1)) override val deleteProjectsRootAfterEachTest = false diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenHandleMissingRuntimeSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenHandleMissingRuntimeSpec.scala index dab5d31bf265..e8f8c03db0c4 100644 --- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenHandleMissingRuntimeSpec.scala +++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenHandleMissingRuntimeSpec.scala @@ -1,6 +1,12 @@ package org.enso.projectmanager.protocol +import nl.gn0s1s.bump.SemVer +import org.enso.runtimeversionmanager.test.OverrideTestVersionSuite -class ProjectOpenHandleMissingRuntimeSpec extends ProjectOpenSpecBase { +class ProjectOpenHandleMissingRuntimeSpec + extends ProjectOpenSpecBase + with OverrideTestVersionSuite { + + override def testVersion: SemVer = SemVer(0, 0, 1) "project/open" should { behave like correctlyHandleMissingRuntimeInPresenceOfEngine() diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenMissingComponentsSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenMissingComponentsSpec.scala index 9d0fe9f528f9..910d563cfc80 100644 --- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenMissingComponentsSpec.scala +++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenMissingComponentsSpec.scala @@ -1,6 +1,12 @@ package org.enso.projectmanager.protocol +import nl.gn0s1s.bump.SemVer +import org.enso.runtimeversionmanager.test.OverrideTestVersionSuite -class ProjectOpenMissingComponentsSpec extends ProjectOpenSpecBase { +class ProjectOpenMissingComponentsSpec + extends ProjectOpenSpecBase + with OverrideTestVersionSuite { + + override val testVersion: SemVer = defaultVersion override def beforeAll(): Unit = { super.beforeAll() @@ -10,4 +16,5 @@ class ProjectOpenMissingComponentsSpec extends ProjectOpenSpecBase { "project/open" should { behave like correctlyHandleMissingComponents() } + } diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectShutdownSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectShutdownSpec.scala index e9ab364bbd73..86eacd4652d7 100644 --- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectShutdownSpec.scala +++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectShutdownSpec.scala @@ -2,6 +2,7 @@ package org.enso.projectmanager.protocol import akka.actor.ActorRef import io.circe.literal._ +import nl.gn0s1s.bump.SemVer import org.enso.jsonrpc.ClientControllerFactory import org.enso.projectmanager.boot.configuration.TimeoutConfig import org.enso.projectmanager.event.ClientEvent.ClientDisconnected @@ -9,7 +10,7 @@ import zio.{ZAny, ZIO} import java.util.UUID import org.enso.projectmanager.{BaseServerSpec, ProjectManagementOps} -import org.enso.runtimeversionmanager.CurrentVersion +import org.enso.runtimeversionmanager.test.OverrideTestVersionSuite import org.enso.testkit.FlakySpec import scala.concurrent.duration._ @@ -17,14 +18,17 @@ import scala.concurrent.duration._ class ProjectShutdownSpec extends BaseServerSpec with FlakySpec + with OverrideTestVersionSuite with ProjectManagementOps { + override val testVersion: SemVer = SemVer(0, 0, 1) + override def beforeEach(): Unit = { super.beforeEach() gen.reset() } - override val engineToInstall = Some(CurrentVersion.version) + override val engineToInstall = Some(SemVer(0, 0, 1)) override val deleteProjectsRootAfterEachTest = false diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar deleted file mode 100644 index bb4b9533544b..000000000000 --- a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar +++ /dev/null @@ -1,2 +0,0 @@ -placeholder - diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar deleted file mode 100644 index bb4b9533544b..000000000000 --- a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-linux-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar +++ /dev/null @@ -1,2 +0,0 @@ -placeholder - diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar deleted file mode 100644 index bb4b9533544b..000000000000 --- a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runner.jar +++ /dev/null @@ -1,2 +0,0 @@ -placeholder - diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar deleted file mode 100644 index bb4b9533544b..000000000000 --- a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-macos-amd64.tar.gz/enso-0.0.0-dev/component/runtime.jar +++ /dev/null @@ -1,2 +0,0 @@ -placeholder - diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runner.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runner.jar deleted file mode 100644 index bb4b9533544b..000000000000 --- a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runner.jar +++ /dev/null @@ -1,2 +0,0 @@ -placeholder - diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runtime.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runtime.jar deleted file mode 100644 index bb4b9533544b..000000000000 --- a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/enso-engine-0.0.0-dev-windows-amd64.zip/enso-0.0.0-dev/component/runtime.jar +++ /dev/null @@ -1,2 +0,0 @@ -placeholder - diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/manifest.yaml b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/manifest.yaml deleted file mode 100644 index 8900af309a5d..000000000000 --- a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-0.0.0-dev/manifest.yaml +++ /dev/null @@ -1,13 +0,0 @@ -minimum-launcher-version: 0.0.0-dev -minimum-project-manager-version: 0.0.0-dev -graal-vm-version: 1.0.0 -graal-java-version: 11 -jvm-options: - - value: "-Dtruffle.class.path.append=$enginePackagePath\\component\\runtime.jar" - os: "windows" - - value: "-Dtruffle.class.path.append=$enginePackagePath/component/runtime.jar" - os: "linux" - - value: "-Dtruffle.class.path.append=$enginePackagePath/component/runtime.jar" - os: "macos" - - value: "-Doptions-added-from-manifest=42" - - value: "-Denso.version.override=0.0.0-dev" diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar deleted file mode 100644 index bb4b9533544b..000000000000 --- a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar +++ /dev/null @@ -1,2 +0,0 @@ -placeholder - diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar deleted file mode 100644 index bb4b9533544b..000000000000 --- a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-linux-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar +++ /dev/null @@ -1,2 +0,0 @@ -placeholder - diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar deleted file mode 100644 index bb4b9533544b..000000000000 --- a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runner.jar +++ /dev/null @@ -1,2 +0,0 @@ -placeholder - diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar deleted file mode 100644 index bb4b9533544b..000000000000 --- a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-macos-amd64.tar.gz/enso-2023.2.1-dev/component/runtime.jar +++ /dev/null @@ -1,2 +0,0 @@ -placeholder - diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runner.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runner.jar deleted file mode 100644 index bb4b9533544b..000000000000 --- a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runner.jar +++ /dev/null @@ -1,2 +0,0 @@ -placeholder - diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runtime.jar b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runtime.jar deleted file mode 100644 index bb4b9533544b..000000000000 --- a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/enso-engine-2023.2.1-dev-windows-amd64.zip/enso-2023.2.1-dev/component/runtime.jar +++ /dev/null @@ -1,2 +0,0 @@ -placeholder - diff --git a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/manifest.yaml b/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/manifest.yaml deleted file mode 100644 index c82651177f10..000000000000 --- a/lib/scala/runtime-version-manager-test/src/main/resources/org/enso/runtimeversionmanager/test/fake-releases/enso/enso-2023.2.1-dev/manifest.yaml +++ /dev/null @@ -1,13 +0,0 @@ -minimum-launcher-version: 0.0.0-dev -minimum-project-manager-version: 0.0.0-dev -graal-vm-version: 1.0.0 -graal-java-version: 11 -jvm-options: - - value: "-Dtruffle.class.path.append=$enginePackagePath\\component\\runtime.jar" - os: "windows" - - value: "-Dtruffle.class.path.append=$enginePackagePath/component/runtime.jar" - os: "linux" - - value: "-Dtruffle.class.path.append=$enginePackagePath/component/runtime.jar" - os: "macos" - - value: "-Doptions-added-from-manifest=42" - - value: "-Denso.version.override=2023.2.1-dev"