diff --git a/.github/workflows/build_mpsqa.yml b/.github/workflows/build_mpsqa.yml
index e6c94e08..277eea4d 100644
--- a/.github/workflows/build_mpsqa.yml
+++ b/.github/workflows/build_mpsqa.yml
@@ -40,7 +40,7 @@ jobs:
uses: gradle/gradle-build-action@v2
with:
arguments: >
- build migrate
+ build migrate rerunMigrations
-Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}}
-Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}}
wrapper-cache-enabled: true
diff --git a/build.gradle b/build.gradle
index e536669e..558dfdf3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,8 @@ plugins {
id 'base'
id 'maven-publish'
id 'co.riiid.gradle' version '0.4.2'
+
+ id 'de.itemis.mps.gradle.launcher' version '2.2.0.+'
}
ext.jbrVers = '17.0.6-b469.82'
@@ -114,7 +116,7 @@ if (project.skipResolveMps) {
}
}
} else {
- task resolveMps(type: Copy) {
+ task resolveMps(type: Sync) {
dependsOn configurations.mps
from {
configurations.mps.resolve().collect { zipTree(it) }
@@ -139,8 +141,6 @@ def defaultScriptArgs = [
'build.dir' : buildDir,
'version' : version,
'build.date' : new Date(),
- //incremental build support
- 'mps.generator.skipUnmodifiedModels': true
]
// enables https://github.com/mbeddr/mps-gradle-plugin#providing-global-defaults
@@ -328,10 +328,12 @@ defaultTasks 'build'
task rebuild(dependsOn:[clean, build_allInOne_package])
+ext.allProjectDirectories = { file('code/languages').listFiles({ File file -> file.directory } as FileFilter) }
+
tasks.register('migrate', MpsMigrate) {
dependsOn(resolveMps, 'downloadJbr', 'build_all_languages')
javaExecutable = layout.file(
- tasks.named('downloadJbr', DownloadJbrForPlatform).map {it.javaExecutable })
+ tasks.named('downloadJbr', DownloadJbrForPlatform).map { it.javaExecutable })
haltOnPrecheckFailure = true
haltOnDependencyError = true
@@ -340,8 +342,42 @@ tasks.register('migrate', MpsMigrate) {
folderMacros.put('mpsqa.home', layout.projectDirectory)
- projectDirectories.from({ file('code/languages').listFiles({ File file -> file.directory } as FileFilter) })
+ projectDirectories.from(allProjectDirectories)
pluginRoots.from(new File(mpsHomeDir, 'plugins/mps-build'))
pluginRoots.from(new File(mpsHomeDir, 'plugins/mps-console'))
}
+
+configurations {
+ rerunMigrationsBackend
+}
+
+dependencies {
+ rerunMigrationsBackend("de.itemis.mps.build-backends:rerun-migrations:0.0.1.83.+")
+}
+
+tasks.register('rerunMigrations', JavaExec) {
+ mustRunAfter('migrate')
+ mustRunAfter('build_all_languages')
+
+ dependsOn(resolveMps, 'downloadJbr')
+ mpsBackendLauncher.builder()
+ .withMpsHome(mpsHomeDir)
+ .withJavaExecutable(tasks.named('downloadJbr', DownloadJbrForPlatform).map { it.javaExecutable.path })
+ .configure(it)
+
+ classpath(configurations.rerunMigrationsBackend)
+ classpath(fileTree(mpsHomeDir) {
+ include("lib/**/*.jar")
+ })
+ mainClass = 'de.itemis.mps.gradle.migrate.MainKt'
+
+ for (dir in allProjectDirectories()) {
+ args("--project=$dir")
+ }
+
+ args("--macro=mpsqa.home::${rootDir}")
+ args("--plugin=jetbrains.mps.console::mps-console")
+ args("--plugin=jetbrains.mps.trove::mps-trove")
+ args("--plugin=jetbrains.mps.ide.modelchecker::mps-modelchecker")
+}
diff --git a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
index 626c6f79..007fe124 100644
--- a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
+++ b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
@@ -9,6 +9,7 @@
+
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps
index fdf6cf6a..c2b5cfae 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps
@@ -74,6 +74,9 @@
+
+
+
@@ -188,6 +191,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -248,6 +275,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -316,6 +367,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -381,6 +456,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -446,6 +545,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -511,6 +634,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps
index 5c5f4021..6dd6b852 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps
@@ -210,6 +210,25 @@
+
+
+
+
+
+
+