feat(git-import): new docker image for running the Git importer

Author: slisson

commitlint.config.js

@@ -10,6 +10,7 @@ module.exports = {
         "bulk-model-sync-gradle",
         "datastructures",
         "deps",
+        "git-import",
         "metamodel-export",
         "model-api-gen",
         "model-api-gen-gradle",
@@ -19,7 +20,6 @@ module.exports = {
         "model-server",
         "model-server-openapi",
         "modelql",
-        "mps-git-import-plugin",
         "mps-model-adapters",
         "mps-model-server",
         "mps-sync-plugin",

docker-build-gitimport.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+TAG=$( ./modelix-version.sh )
+
+(
+  cd mps-git-import-cli
+  if [ "${CI}" = "true" ]; then
+    docker buildx build --platform linux/amd64,linux/arm64 --push \
+    -t modelix/mps-git-import:latest -t "modelix/mps-git-import:${TAG}" .
+  else
+    docker build \
+    -t modelix/mps-git-import:latest -t "modelix/mps-git-import:${TAG}" .
+  fi
+)

docker-ci.sh

@@ -5,3 +5,4 @@ set -e
 echo "$DOCKER_HUB_KEY" | docker login -u "$DOCKER_HUB_USER" --password-stdin
 
 ./docker-build-model.sh
+./docker-build-gitimport.sh

gradle/libs.versions.toml

@@ -32,7 +32,7 @@ kotlinSerialization="1.8.1"
 ignite="2.17.0"
 apacheCxf="3.6.6"
 node="22.14.0"
-modelixBuildtools="1.8.1"
+modelixBuildtools="1.9.0"
 openapi = "7.12.0"
 micrometer = "1.14.6"
 dokka = "2.0.0"

mps-git-import-cli/Dockerfile

@@ -0,0 +1,23 @@
+FROM eclipse-temurin:21
+ARG MPS_VERSION="2024.1.3"
+
+RUN apt update && apt install wget ant -y
+
+# download MPS and extract into /mps
+RUN set -e \
+    && mkdir /mpstmp \
+    && cd /mpstmp \
+    && MPS_MAJOR_VERSION=`echo "$MPS_VERSION" | grep -oE '20[0-9]{2}\.[0-9]+'` \
+    && wget "https://download.jetbrains.com/mps/${MPS_MAJOR_VERSION}/MPS-${MPS_VERSION}.tar.gz" \
+    && tar -xf $(ls | head -n 1) \
+    && mv "MPS $MPS_MAJOR_VERSION" "/mps" \
+    && cd .. \
+    && rm -rf /mpstmp \
+    && rm -rf /mps/jbr
+
+COPY build/install/mps-git-import-cli /mps-git-import-cli
+
+#RUN /mps-git-import-cli/bin/mps-git-import-cli self-test
+
+ENTRYPOINT ["/mps-git-import-cli/bin/mps-git-import-cli"]
+CMD ["self-test"]

mps-git-import-cli/build.gradle.kts

@@ -0,0 +1,27 @@
+import org.modelix.mpsHomeDir
+
+plugins {
+    `modelix-kotlin-jvm-with-junit`
+    `maven-publish`
+    application
+    alias(libs.plugins.modelix.mps.buildtools)
+}
+
+dependencies {
+    implementation(project(":mps-git-import"))
+    implementation(libs.modelix.buildtools.lib)
+
+    compileOnly(
+        fileTree(mpsHomeDir).matching {
+            include("lib/**/*.jar")
+        },
+    )
+}
+
+application {
+    mainClass.set("org.modelix.mps.gitimport.cli.MainKt")
+}
+
+tasks.assemble {
+    dependsOn(tasks.installDist)
+}

mps-git-import-cli/src/main/kotlin/org/modelix/mps/gitimport/cli/Main.kt

@@ -0,0 +1,25 @@
+package org.modelix.mps.gitimport.cli
+
+import org.modelix.buildtools.runner.MPSRunner
+import org.modelix.buildtools.runner.MPSRunnerConfig
+import java.io.File
+import java.util.UUID
+
+fun main(args: Array<String>) {
+    val buildDir = File("/tmp/git-import-build")
+    val workDir = File("/tmp/git-import-work")
+    buildDir.mkdirs()
+    workDir.mkdirs()
+    val config = MPSRunnerConfig(
+        mainClassName = "org.modelix.mps.gitimport.MainKt",
+        mainMethodName = "runFromAnt",
+        mpsHome = File("/mps"),
+        jarFolders = listOf(File("/mps-git-import-cli/lib")),
+        jvmArgs = args.mapIndexed { index, arg -> "-Dmodelix.git.import.args.$index=$arg" },
+        moduleId = UUID.randomUUID(),
+        buildDir = buildDir,
+        workDir = workDir,
+    )
+    val runner = MPSRunner(config)
+    runner.run()
+}

mps-git-import-plugin/build.gradle.kts

@@ -19,14 +19,14 @@ dependencies {
         exclude("org.slf4j", "slf4j-api")
     }
 
+    implementation(project(":mps-git-import"), excludeMPSLibraries)
     implementation(project(":bulk-model-sync-lib"), excludeMPSLibraries)
     implementation(project(":bulk-model-sync-mps"), excludeMPSLibraries)
     implementation(project(":mps-model-adapters"), excludeMPSLibraries)
     implementation(project(":model-client"), excludeMPSLibraries)
     implementation(project(":datastructures"), excludeMPSLibraries)
     implementation(libs.modelix.mpsApi, excludeMPSLibraries)
     implementation(libs.kotlin.logging, excludeMPSLibraries)
-    implementation(libs.kotlin.html, excludeMPSLibraries)
     implementation(libs.kotlin.datetime, excludeMPSLibraries)
     implementation("org.eclipse.jgit:org.eclipse.jgit:7.2.0.202503040940-r")
     implementation("com.github.ajalt.clikt:clikt:5.0.3")

mps-git-import/build.gradle.kts

@@ -0,0 +1,40 @@
+import org.modelix.mpsHomeDir
+
+plugins {
+    `modelix-kotlin-jvm-with-junit`
+    `maven-publish`
+}
+
+dependencies {
+    implementation(project(":bulk-model-sync-lib"))
+    implementation(project(":bulk-model-sync-mps"))
+    implementation(project(":mps-model-adapters"))
+    implementation(project(":model-client"))
+    implementation(project(":datastructures"))
+    implementation(libs.modelix.mpsApi)
+    implementation(libs.kotlin.logging)
+    implementation(libs.kotlin.datetime)
+    implementation("org.eclipse.jgit:org.eclipse.jgit:7.2.0.202503040940-r")
+    api("com.github.ajalt.clikt:clikt:5.0.3")
+
+    compileOnly(
+        fileTree(mpsHomeDir).matching {
+            include("lib/**/*.jar")
+        },
+    )
+}
+
+group = "org.modelix.mps"
+
+java {
+    withSourcesJar()
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            artifactId = "git-import"
+            from(components["java"])
+        }
+    }
+}