Merge remote-tracking branch 'origin/maintenance/MPS-2024.1' into merge/MPS-2024.1-partial

Author: sergej-koscejev

.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+  - package-ecosystem: gradle
+    directory: /
+    schedule:
+      interval: weekly
+    registries: "*"
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
+
+registries:
+  itemis:
+    type: maven-repository
+    url: https://artifacts.itemis.cloud/repository/maven-mps

.github/workflows/build_mpsqa.yml

@@ -16,38 +16,46 @@ on:
         required: false
 
 env:
-  GITHUB_TOKEN: ${{ secrets.MPSQA_GITHUB_PKG_REGISTRY }}
+  GITHUB_TOKEN: ${{ secrets.MPS_CI_BUILD_BOT_ACCESS_TOKEN }}
 
 jobs:
   build_mps_qa_packages:
     runs-on: ubuntu-latest
-    env:
-      DISPLAY: ':99'
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - name: Setup headless environment
-      run: |
-        Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-       
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
+    - name: Set up JDK
+      uses: actions/setup-java@v4
       with:
-        java-version: 11  
-        
+        java-version: 17
+        distribution: temurin
+
+    - name: Set up Gradle
+      uses: gradle/actions/setup-gradle@v4
+
     - name: Build MPS-QA and migrate
-      uses: gradle/gradle-build-action@v2
-      with: 
-        arguments: >
-          build migrate remigrate
-          -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}}
-          -Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}}
-        wrapper-cache-enabled: true
-        dependencies-cache-enabled: true
-        dependencies-cache-key: gradle/dependency-locks/**
-        dependencies-cache-exact: true
-        configuration-cache-enabled: true
+      run: |
+          xvfb-run ./gradlew build migrate remigrate \
+            -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}} \
+            -Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}}
+
+    - name: Dump Java stacks on cancellation
+      if: cancelled()
+      run: |
+        jps -mlv > build/jps.txt
+        for pid in $(jps -q); do jstack -l -e $pid > build/stack$pid.txt || true; done
+
+    - name: Upload logs on cancellation or failure
+      uses: actions/upload-artifact@v4
+      if: cancelled() || failure()
+      with:
+        name: logs
+        path: |
+          build/system/log/
+          build/system/testlog/
+          build/jps.txt
+          build/stack*.txt
 
     - name: Check for no dirty files after build and migration
       run: |
@@ -62,21 +70,14 @@ jobs:
         fi
 
     - name: Publish
-      uses: gradle/gradle-build-action@v2
 
       # Only publish on push (to maintenance or master) or when explicitly requested
       if: ${{ github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.publish == 'true') }}
 
-      with:
-        arguments: >
-          publish -x build_allInOne_package
-          -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}}
+      run: |
+        ./gradlew publish -x build_allInOne_package \
+          -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}} \
           -Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}}
-        wrapper-cache-enabled: true
-        dependencies-cache-enabled: true
-        dependencies-cache-key: gradle/dependency-locks/**
-        dependencies-cache-exact: true
-        configuration-cache-enabled: true
 
     - name: Archive distribution
       uses: actions/upload-artifact@v4

.gitignore

@@ -25,3 +25,6 @@ TESTS-*.xml
 # RCP
 build/
 !/build/scripts/build_all_scripts.xml
+
+# Mac-specific
+.DS_Store

build.gradle

@@ -9,10 +9,10 @@ plugins {
     id 'maven-publish'
     id 'co.riiid.gradle' version '0.4.2'
 
-    id 'de.itemis.mps.gradle.launcher' version '2.2.0.+'
+    id 'de.itemis.mps.gradle.launcher' version '2.5.2.+'
 }
 
-ext.jbrVers = '17.0.8.1-b1000.32'
+ext.jbrVers = '17.0.11-b1207.30'
 
 downloadJbr {
     jbrVersion = jbrVers
@@ -27,44 +27,11 @@ if (System.env.CI != null && System.env.CI.toBoolean()) {
     ext.ciBuild = project.hasProperty("teamcity")
 }
 
-// Detect jdk location, required to start ant with tools.jar on classpath otherwise javac and tests will fail
-String jdk_home
-
-if (ext.has('java11_home')) {
-    jdk_home = ext.get('java11_home')
-} else if (System.getenv('JB_JAVA11_HOME') != null) {
-    jdk_home = System.getenv('JB_JAVA11_HOME')
-} else {
-    def expected = JavaVersion.VERSION_11
-    if (JavaVersion.current() < expected) {
-        throw new GradleException("This build script requires Java 11 but you are currently using ${JavaVersion.current()}.\nWhat you can do:\n"
-                + "  * Use project property java11_home to point to the Java 11 JDK.\n"
-                + "  * Use environment variable JB_JAVA11_HOME to point to the Java 11 JDK\n"
-                + "  * Run Gradle using Java 11")
-    }
-    jdk_home = System.getProperty('java.home')
-}
-
-// Check JDK location
-if (!new File(jdk_home, "lib").exists()) {
-    throw new GradleException("Unable to locate JDK home folder. Detected folder is: $jdk_home")
-}
-
-logger.info 'Using JDK at {}', jdk_home
-
-ext.jdk_home = jdk_home
-
-ext.dependencyRepositories = [
-        'https://maven.pkg.github.com/mbeddr/*',
-        'https://artifacts.itemis.cloud/repository/maven-mps/'
-]
-
-// Dependency versions
-ext.mpsVersion = '2023.2.1'
+ext.mpsVersion =  '2024.1.1'
 
 // Project versions
-ext.major = '2023'
-ext.minor = '2'
+ext.major = '2024'
+ext.minor = '1'
 
 if (ciBuild) {
     String branch = GitBasedVersioning.gitBranch
@@ -90,20 +57,21 @@ configurations {
 
 dependencies {
     mps "com.jetbrains:mps:$mpsVersion"
-    antLib "org.apache.ant:ant-junit:1.10.6"
+    antLib "org.apache.ant:ant-junit:1.10.15"
     antLib "org.jacoco:org.jacoco.ant:0.8.12"
 }
 
 repositories {
-    for (repoUrl in project.dependencyRepositories) {
-        maven {
-            url repoUrl
-            credentials {
-                username = project.findProperty("github_username") ?: System.getenv("GITHUB_ACTOR")
-                password = project.findProperty("github_token") ?: System.getenv("GITHUB_TOKEN")
-            }
+    maven {
+        url 'https://maven.pkg.github.com/mbeddr/*'
+        credentials {
+            username = project.findProperty("github_username") ?: System.getenv("GITHUB_ACTOR")
+            password = project.findProperty("github_token") ?: System.getenv("GITHUB_TOKEN")
         }
     }
+    maven {
+        url 'https://artifacts.itemis.cloud/repository/maven-mps/'
+    }
     mavenCentral()
 }
 
@@ -128,8 +96,7 @@ if (project.skipResolveMps) {
 }
 
 // tools needed for compiler support in ant calls
-ext.buildScriptClasspath = project.configurations.antLib.fileCollection { true } +
-        project.files("$project.jdk_home/lib/tools.jar")
+ext.buildScriptClasspath = project.configurations.antLib
 
 def artifactsDir = file("$buildDir/artifacts")
 def dependenciesDir = file("$buildDir/dependencies")
@@ -343,8 +310,21 @@ defaultTasks 'build'
 
 task rebuild(dependsOn:[clean, build_allInOne_package])
 
-ext.allProjectDirectories = { file('code/languages').listFiles({ File file -> file.directory } as FileFilter) }
-ext.mpsPluginRoots = ['mps-build', 'mps-console', 'mps-trove', 'mps-modelchecker']
+ext.allProjectDirectoriesInDependencyOrder = [
+        'org.mpsqa.base',
+        'org.mpsqa.testing',
+        'org.mpsqa.build',
+
+        'org.mpsqa.arch',
+        'org.mpsqa.clones',
+        'org.mpsqa.deprecated',
+        'org.mpsqa.lint',
+        'org.mpsqa.mutant',
+        'org.mpsqa.profile',
+        'org.mpsqa.testing',
+        'org.mpsqa.unused'
+].collect { file("code/languages/$it") }
+ext.mpsPluginRoots = ['mps-build', 'mps-console', 'mps-trove', 'mps-modelchecker', 'mps-testing']
         .collect { new File(mpsHomeDir, "plugins/$it") }
 ext.jbrJavaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
 
@@ -354,7 +334,7 @@ tasks.register('migrate', MpsMigrate) {
     javaLauncher = jbrJavaLauncher
     mpsHome = mpsHomeDir
     folderMacros.put('mpsqa.home', layout.projectDirectory)
-    projectDirectories.from(allProjectDirectories)
+    projectDirectories.from(allProjectDirectoriesInDependencyOrder)
     pluginRoots.from(mpsPluginRoots)
 
     haltOnPrecheckFailure = true
@@ -372,6 +352,6 @@ tasks.register('remigrate', Remigrate) {
     javaLauncher = jbrJavaLauncher
     mpsHome = mpsHomeDir
     folderMacros.put('mpsqa.home', layout.projectDirectory)
-    projectDirectories.from(allProjectDirectories)
+    projectDirectories.from(allProjectDirectoriesInDependencyOrder)
     pluginRoots.from(mpsPluginRoots)
 }