Merge remote-tracking branch 'origin/main' into feature/resource-based-routing

# Conflicts:
#	gradle/libs.versions.toml
#	model-server/src/main/kotlin/org/modelix/model/server/handlers/ModelReplicationServer.kt

Author: nkoester

.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 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/publish.yml

@@ -29,7 +29,21 @@ jobs:
       - name: Use tag as version
         run: echo "${GITHUB_REF#refs/*/}" > version.txt
       - name: Build and Publish Artifacts
-        run: ./gradlew --build-cache build publish -PciBuild=true -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}} -Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}} -Pgpr.user=${{ github.actor }} -Pgpr.key=${{ secrets.GITHUB_TOKEN }} -Pgpr.universalkey=${{ secrets.GHP_UNIVERSAL_PUBLISH_TOKEN }}
+        # We run gradle with --info to debug the ongoing random publishing
+        # issues. Gradle would log upload retries on info level:
+        # https://github.com/gradle/gradle/blob/2e843f089f969940e505e69eb0742ed4fbf67993/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/transport/NetworkOperationBackOffAndRetry.java#L64
+        # Maybe retries are the source of our duplicate publication attempts.
+        run: >-
+          ./gradlew --build-cache build publish
+          --info
+          -PciBuild=true
+          -Partifacts.itemis.cloud.user=${{ secrets.ARTIFACTS_ITEMIS_CLOUD_USER }}
+          -Partifacts.itemis.cloud.pw=${{ secrets.ARTIFACTS_ITEMIS_CLOUD_PW }}
+          -Pgpr.user=${{ github.actor }}
+          -Pgpr.key=${{ secrets.GITHUB_TOKEN }}
+          -Pgpr.universalkey=${{ secrets.GHP_UNIVERSAL_PUBLISH_TOKEN }}
+          -Porg.gradle.internal.http.connectionTimeout=180000
+          -Porg.gradle.internal.http.socketTimeout=180000
         env:
           NODE_AUTH_TOKEN: ${{ secrets.ARTIFACTS_ITEMIS_CLOUD_NPM_TOKEN }}
       - name: Set up QEMU

.github/workflows/release.yaml

@@ -0,0 +1,32 @@
+name: Release
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 2 * * *' # run at 2 AM UTC
+
+jobs:
+  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

.gitignore

@@ -1,6 +1,7 @@
 .gradle/
 /build/
 /*/build/
+/*/ignite/
 .DS_Store
 .gradletasknamecache
 .idea/

.pre-commit-config.yaml

@@ -24,7 +24,7 @@ repos:
         additional_dependencies: ["@commitlint/config-angular"]
         args: ["--config", "./commitlint.config.js"]
   - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-    rev: v2.10.0
+    rev: v2.12.0
     hooks:
       - id: pretty-format-kotlin
         args:

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

@@ -24,11 +24,29 @@ 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 kotlinGenDir = project.layout.buildDirectory.dir("metamodel/kotlin").get().asFile.apply { mkdirs() }
@@ -84,15 +102,15 @@ modelSync {
             repositoryDir = repoDir
         }
         toModelServer {
-            url = "http://0.0.0.0:28309/v2"
+            url = "http://localhost:28309/v2"
             repositoryId = "ci-test"
             branchName = "master"
         }
     }
     direction("testPull") {
         includeModule("GraphSolution")
         fromModelServer {
-            url = "http://0.0.0.0:28309/v2"
+            url = "http://localhost:28309/v2"
             repositoryId = "ci-test"
             branchName = "master"
         }

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

@@ -21,14 +21,8 @@ fi
 
 ./gradlew runModelServer --console=plain &
 MODEL_SERVER_PID=$!
-sleep 5
 
-#CI needs more time
-if [ "${CI}" = "true" ]; then
-  sleep 10
-fi
-
-curl -X POST http://127.0.0.1:28309/v2/repositories/ci-test/init
+curl -X GET --retry 30 --retry-connrefused --retry-delay 1 http://localhost:28309/health
 
 ./gradlew runSyncTestPush --console=plain --stacktrace
 ./gradlew test --tests 'PushTest'