Merge branch 'main' into build/do-not-update-version-before-publishing

Author: slisson

.github/CODEOWNERS

@@ -3,6 +3,7 @@
 /bulk-model-sync-gradle/ @mhuster23
 /bulk-model-sync-gradle-test/ @mhuster23
 /bulk-model-sync-lib/ @mhuster23
+/bulk-model-sync-mps/ @mhuster23
 /bulk-model-sync-solution/ @mhuster23
 /light-model-client/ @slisson
 /metamodel-export/ @slisson

.github/workflows/release.yml .github/workflows/dry-run-release.yml.github/workflows/release.yml renamed to .github/workflows/dry-run-release.yml

@@ -1,15 +1,11 @@
-name: Release
+name: Dry-Run Release
 on:
-  push:
-    branches:
-      - main
-  pull_request: {}
+  pull_request:
 
 jobs:
   lint-commits:
     name: Lint PR commits
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'pull_request' }}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -19,7 +15,6 @@ jobs:
   test-release:
     name: Dry-run semantic-release
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'pull_request' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -48,29 +43,3 @@ jobs:
         # configuration from the CI environment by removing the variable that
         # is used for CI detection.
         run: unset GITHUB_ACTIONS && npx semantic-release --dry-run --ci false
-
-  release:
-    name: Run semantic release
-    runs-on: ubuntu-latest
-    if: ${{ github.ref == 'refs/heads/main' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.RELEASE_TOKEN }}
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - name: Cache Node packages
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: release-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
-      - name: Install dependencies
-        run: npm ci
-      - name: Release
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-        run: npx semantic-release

.github/workflows/mps-compatibility.yaml

@@ -33,4 +33,10 @@ jobs:
       - name: Set up Gradle
         uses: gradle/gradle-build-action@v2
       - name: Build with ${{ matrix.version }}
-        run: ./gradlew --build-cache :mps-model-adapters:build :mps-model-server-plugin:build -Pmps.version=${{ matrix.version }}
+        run: >-
+          ./gradlew --build-cache
+          :bulk-model-sync-mps:build
+          :metamodel-export:build
+          :mps-model-adapters:build
+          :mps-model-server-plugin:build
+          -Pmps.version=${{ matrix.version }}

.github/workflows/release.yaml

@@ -0,0 +1,31 @@
+name: Release
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 2 * * *' # run at 2 AM UTC
+
+jobs:
+  release:
+    name: Run semantic release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.RELEASE_TOKEN }}
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - name: Cache Node packages
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: release-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
+      - name: Install dependencies
+        run: npm ci
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        run: npx semantic-release

build.gradle.kts

@@ -168,10 +168,24 @@ subprojects {
 
 allprojects {
     repositories {
-        mavenLocal()
-        maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
-        maven { url = uri("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") }
-        mavenCentral()
+        val modelixRegex = "org\\.modelix.*"
+        mavenLocal {
+            content {
+                includeGroupByRegex(modelixRegex)
+            }
+        }
+        maven {
+            url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
+            content {
+                includeGroupByRegex(modelixRegex)
+                includeGroup("com.jetbrains") // for our mps dependencies
+            }
+        }
+        mavenCentral {
+            content {
+                excludeGroupByRegex(modelixRegex)
+            }
+        }
     }
 
     publishing {

bulk-model-sync-gradle-test/build.gradle.kts

@@ -14,16 +14,6 @@
  * limitations under the License.
  */
 
-import org.modelix.model.server.Main
-
-buildscript {
-    val modelixCoreVersion: String = file("../version.txt").readText()
-    dependencies {
-        classpath("org.modelix:model-server:$modelixCoreVersion")
-        classpath("org.modelix:graph-lang-api:$modelixCoreVersion")
-    }
-}
-
 plugins {
     alias(libs.plugins.kotlin.jvm)
     id("org.modelix.bulk-model-sync")
@@ -34,19 +24,34 @@ val modelixCoreVersion: String = file("../version.txt").readText()
 version = modelixCoreVersion
 
 repositories {
-    mavenLocal()
-    maven { url = uri("https://repo.maven.apache.org/maven2") }
-    maven { url = uri("https://plugins.gradle.org/m2/") }
-    mavenCentral()
-    maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
+    val modelixRegex = "org\\.modelix.*"
+    mavenLocal {
+        content {
+            includeGroupByRegex(modelixRegex)
+        }
+    }
+    gradlePluginPortal {
+        content {
+            excludeGroupByRegex(modelixRegex)
+        }
+    }
+    maven {
+        url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
+        content {
+            includeGroupByRegex(modelixRegex)
+            includeGroup("com.jetbrains")
+        }
+    }
+    mavenCentral {
+        content {
+            excludeGroupByRegex(modelixRegex)
+        }
+    }
 }
 
-val mps by configurations.creating
-val mpsDir = project.layout.buildDirectory.dir("mps").get().asFile.apply { mkdirs() }
 val kotlinGenDir = project.layout.buildDirectory.dir("metamodel/kotlin").get().asFile.apply { mkdirs() }
 
 dependencies {
-    mps("com.jetbrains:mps:2021.2.5")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2")
     implementation("org.modelix:model-server:$modelixCoreVersion")
     implementation("org.modelix:model-api-gen-runtime:$modelixCoreVersion")
@@ -74,12 +79,7 @@ tasks.register("runModelServer", JavaExec::class) {
 
     classpath = sourceSets["main"].runtimeClasspath
     mainClass.set("org.modelix.model.server.Main")
-    args("-inmemory")
-}
-
-val resolveMps by tasks.registering(Copy::class) {
-    from(mps.resolve().map { zipTree(it) })
-    into(mpsDir)
+    args("-inmemory", "-port", "28309")
 }
 
 val repoDir = project.layout.buildDirectory.dir("test-repo").get().asFile
@@ -89,32 +89,32 @@ val copyTestRepo by tasks.registering(Sync::class) {
     into(repoDir)
 }
 
+mpsBuild {
+    mpsVersion("2021.2.5")
+}
+
 modelSync {
-    dependsOn(resolveMps)
     dependsOn(copyTestRepo)
     direction("testPush") {
-        org.modelix.model.sync.bulk.gradle.test.GraphLanguagesHelper.registerAll()
         includeModule("GraphSolution")
         fromLocal {
-            mpsHome = mpsDir
             mpsHeapSize = "2g"
             repositoryDir = repoDir
         }
         toModelServer {
-            url = "http://0.0.0.0:${Main.DEFAULT_PORT}/v2"
+            url = "http://localhost:28309/v2"
             repositoryId = "ci-test"
             branchName = "master"
         }
     }
     direction("testPull") {
         includeModule("GraphSolution")
         fromModelServer {
-            url = "http://0.0.0.0:${Main.DEFAULT_PORT}/v2"
+            url = "http://localhost:28309/v2"
             repositoryId = "ci-test"
             branchName = "master"
         }
         toLocal {
-            mpsHome = mpsDir
             repositoryDir = repoDir
         }
     }

bulk-model-sync-gradle-test/ci.sh

@@ -25,10 +25,10 @@ sleep 5
 
 #CI needs more time
 if [ "${CI}" = "true" ]; then
-  sleep 10
+  sleep 20
 fi
 
-curl -X POST http://127.0.0.1:28101/v2/repositories/ci-test/init
+curl -X POST http://127.0.0.1:28309/v2/repositories/ci-test/init
 
 ./gradlew runSyncTestPush --console=plain --stacktrace
 ./gradlew test --tests 'PushTest'

bulk-model-sync-gradle-test/graph-lang-api/build.gradle.kts

@@ -32,11 +32,6 @@ val resolveMps by tasks.registering(Copy::class) {
 
 val repoDir = projectDir.resolve("test-repo")
 
-val copyMetamodelToMpsHome by tasks.registering(Copy::class) {
-    from(file(projectDir.resolve("../test-repo/languages")))
-    into(file(mpsDir.resolve("languages").apply { mkdirs() }))
-}
-
 kotlin {
     sourceSets.named("main") {
         kotlin.srcDir(kotlinGenDir)
@@ -45,9 +40,9 @@ kotlin {
 
 metamodel {
     dependsOn(resolveMps)
-    dependsOn(copyMetamodelToMpsHome)
     mpsHome = mpsDir
     kotlinDir = kotlinGenDir
+    modulesFrom(projectDir.parentFile.resolve("test-repo"))
     includeLanguage("GraphLang")
     registrationHelperName = "org.modelix.model.sync.bulk.gradle.test.GraphLanguagesHelper"
 }

bulk-model-sync-gradle-test/settings.gradle.kts

@@ -16,22 +16,58 @@
 
 pluginManagement {
     val modelixCoreVersion: String = file("../version.txt").readText()
+    val modelixRegex = "org\\.modelix.*"
     plugins {
         id("org.modelix.bulk-model-sync") version modelixCoreVersion
         id("org.modelix.model-api-gen") version modelixCoreVersion
     }
     repositories {
-        mavenLocal()
-        gradlePluginPortal()
-        maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
-        mavenCentral()
+        mavenLocal {
+            content {
+                includeGroupByRegex(modelixRegex)
+            }
+        }
+        gradlePluginPortal {
+            content {
+                excludeGroupByRegex(modelixRegex)
+            }
+        }
+        maven {
+            url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
+            content {
+                includeGroupByRegex(modelixRegex)
+            }
+        }
+        mavenCentral {
+            content {
+                excludeGroupByRegex(modelixRegex)
+            }
+        }
     }
     dependencyResolutionManagement {
         repositories {
-            mavenLocal()
-            gradlePluginPortal()
-            maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
-            mavenCentral()
+            mavenLocal {
+                content {
+                    includeGroupByRegex(modelixRegex)
+                }
+            }
+            gradlePluginPortal {
+                content {
+                    excludeGroupByRegex(modelixRegex)
+                }
+            }
+            maven {
+                url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
+                content {
+                    includeGroupByRegex(modelixRegex)
+                    includeGroup("com.jetbrains")
+                }
+            }
+            mavenCentral {
+                content {
+                    excludeGroupByRegex(modelixRegex)
+                }
+            }
         }
         versionCatalogs {
             create("libs") {

bulk-model-sync-gradle-test/src/test/kotlin/org/modelix/model/sync/bulk/gradle/test/PushTest.kt

@@ -22,7 +22,6 @@ import org.modelix.model.data.ModelData
 import org.modelix.model.data.NodeData
 import org.modelix.model.lazy.BranchReference
 import org.modelix.model.lazy.RepositoryId
-import org.modelix.model.server.Main
 import org.modelix.model.sync.bulk.asExported
 import java.io.File
 import kotlin.test.assertContentEquals
@@ -32,7 +31,7 @@ class PushTest {
     @Test
     fun `nodes were synced to server`() {
         val inputDir = File("build/model-sync/testPush")
-        val files = inputDir.listFiles()?.filter { it.extension == "json" } ?: error("no json files found")
+        val files = inputDir.listFiles()?.filter { it.extension == "json" } ?: error("no json files found in ${inputDir.absolutePath}")
 
         val modules = files.map { ModelData.fromJson(it.readText()) }
         val inputModel = ModelData(root = NodeData(children = modules.map { it.root }))
@@ -42,7 +41,7 @@ class PushTest {
 
         val repoId = RepositoryId("ci-test")
         val branchName = "master"
-        val url = "http://0.0.0.0:${Main.DEFAULT_PORT}/v2"
+        val url = "http://0.0.0.0:28309/v2"
 
         val branchRef = ModelFacade.createBranchReference(repoId, branchName)
         val client = ModelClientV2PlatformSpecificBuilder().url(url).build().apply { runBlocking { init() } }