Merge pull request #194 from modelix/docker-integration-tests

Docker integration tests

Author: slisson

…thub/workflows/binary-compatibility.yaml .github/workflows/build.yaml.github/workflows/binary-compatibility.yaml renamed to .github/workflows/build.yaml .github/workflows/binary-compatibility.yaml renamed to .github/workflows/build.yaml

@@ -1,4 +1,4 @@
-name: Binary Compatibility
+name: Build
 
 on:
   push:
@@ -9,20 +9,30 @@ on:
   workflow_dispatch:
 
 jobs:
-  checkBinaryCompatibility:
-
+  build-mps-components:
     runs-on: ubuntu-latest
-
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - name: Set up Gradle
         uses: gradle/gradle-build-action@v3
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./check-binary-compatibility.sh
+        run: >-
+          ./gradlew --build-cache
+          build
+          -PciBuild=true
+      - name: Archive test report
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: test-report
+          path: |
+            */build/test-results
+            */build/reports

.github/workflows/mps-compatibility.yaml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - name: Set up Gradle
         uses: gradle/gradle-build-action@v3
       - name: Use tag as version
@@ -40,4 +40,3 @@ jobs:
           -Pgpr.user=${{ github.actor }}
           -Pgpr.key=${{ secrets.GITHUB_TOKEN }}
           -Pgpr.universalkey=${{ secrets.GHP_UNIVERSAL_PUBLISH_TOKEN }}
-          -Pmps.version=2023.2

.github/workflows/publish.yml

@@ -98,10 +98,10 @@ subprojects {
 
 allprojects {
     repositories {
-        mavenLocal()
         maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
         mavenCentral()
         maven { url = uri("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") }
+        mavenLocal()
     }
 
     publishing {

build.gradle.kts

@@ -58,8 +58,6 @@ val Project.mpsPlatformVersion: Int get() {
     return mpsVersion.replace(Regex("""20(\d\d)\.(\d+).*"""), "$1$2").toInt()
 }
 
-val Project.mpsJavaVersion: Int get() = if (mpsPlatformVersion >= 223) 17 else 11
-
 val Project.mpsHomeDir: Provider<Directory> get() {
     if (project != rootProject) return rootProject.mpsHomeDir
     return project.layout.buildDirectory.dir("mps-$mpsVersion")

buildSrc/src/main/kotlin/org/modelix/CopyMps.kt

@@ -20,6 +20,7 @@ modelix-modelql-untyped = { group = "org.modelix", name = "modelql-untyped", ver
 modelix-modelql-html = { group = "org.modelix", name = "modelql-html", version.ref = "modelixCore" }
 modelix-model-datastructure = { group = "org.modelix", name = "model-datastructure", version.ref = "modelixCore" }
 modelix-mps-model-adapters = { group = "org.modelix.mps", name = "model-adapters", version.ref = "modelixCore" }
+modelix-mpsApi = { group = "org.modelix.mps", name = "stable-api", version = "1.1.1" }
 
 kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.3" }
 kotlin-logging-microutils = { group = "io.github.microutils", name = "kotlin-logging", version = "3.0.5" }

check-binary-compatibility.sh

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/libs.versions.toml

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail