Skip to content

activate migration checking #1261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mfsoliveira merged 5 commits into from
Mar 27, 2025
Merged

activate migration checking #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b46763b
activate migration checking
Mar 26, 2025
3b634d3
Apply migration
mfsoliveira Mar 26, 2025
1321745
reload build script
mfsoliveira Mar 26, 2025
8384cd7
Update build.gradle
mfsoliveira Mar 26, 2025
e5f442e
Improve build.gradle: remove changes from old maintenance/mps20232 br…
mfsoliveira Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 43 additions & 10 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
import de.itemis.mps.gradle.*
import de.itemis.mps.gradle.tasks.MpsMigrate
import de.itemis.mps.gradle.tasks.Remigrate
import de.itemis.mps.gradle.downloadJBR.DownloadJbrForPlatform
import groovy.xml.XmlSlurper
import java.time.LocalDate
import java.time.format.DateTimeFormatter
import java.time.format.FormatStyle

//will pull the groovy classes/types from nexus to the classpath
buildscript {
repositories {
maven { url 'https://artifacts.itemis.cloud/repository/maven-mps/' }
}
dependencies {
classpath 'de.itemis.mps:mps-gradle-plugin:1.29.1.1.d7f2744'
}
}

plugins {
id 'base'
id 'maven-publish'
id 'de.itemis.mps.gradle.common' version '1.29.+'
id 'de.itemis.mps.gradle.launcher' version '2.5.2.+'
id "com.github.breadmoirai.github-release" version "2.4.1"
id "org.cyclonedx.bom" version "1.8.2"
}
Expand All @@ -25,6 +20,7 @@ repositories {
maven {
url 'https://artifacts.itemis.cloud/repository/maven-mps/'
}

mavenCentral()
}

Expand Down Expand Up @@ -105,6 +101,7 @@ ext.artifactsDir = new File(buildDir, 'artifacts')

configurations {
mps
rerunMigrationsBackend
languageLibs
junitAnt
pcollections // Synced to org.iets3.core.expr.base.collections.stubs/lib
Expand All @@ -113,6 +110,7 @@ configurations {

dependencies {
mps "com.jetbrains:mps:$mpsVersion"
rerunMigrationsBackend("de.itemis.mps.build-backends:remigrate:0.0.5.+")
languageLibs "org.mpsqa:all-in-one:$mpsQAVersion"
languageLibs "com.mbeddr:platform:$mbeddrVersion"
junitAnt 'org.apache.ant:ant-junit:1.10.15'
Expand Down Expand Up @@ -172,6 +170,8 @@ task resolveBigMath(type: Sync) {

task resolveDependencies(dependsOn: ['downloadJbr', resolveMps, resolveLanguageLibs, resolvePcollections, resolveBigMath])

ext.mpsHomeDir = resolveMps.destinationDir

// Default arguments for ant scripts
def defaultScriptArgs = [
'mps.home' : resolveMps.destinationDir,
Expand Down Expand Up @@ -255,6 +255,39 @@ task failOnTestError() {
buildAndRunTests.configure { finalizedBy failOnTestError }
check.dependsOn buildAndRunTests

tasks.register('migrate', MpsMigrate) {
dependsOn(resolveMps, 'resolveMpsForModelcheck', 'downloadJbr', 'buildLanguages', 'buildAndRunTests')
javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }

haltOnPrecheckFailure = false
haltOnDependencyError = true

mpsHome = mpsHomeDir

projectDirectories.from('code/languages/org.iets3.opensource')
folderMacros['iets3.github.opensource.home'] = rootProject.layout.projectDirectory

pluginRoots.from(new File(mpsHomeDir, 'plugins'))

maxHeapSize = '4G'
}

tasks.register('remigrate', Remigrate) {
mustRunAfter('migrate')
mustRunAfter('buildLanguages', 'buildAndRunTests')

dependsOn(resolveMps, 'resolveMpsForModelcheck','downloadJbr')

javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }

mpsHome = mpsHomeDir
projectDirectories.from('code/languages/org.iets3.opensource')
folderMacros['iets3.github.opensource.home'] = rootProject.layout.projectDirectory

pluginRoots.from(new File(mpsHomeDir, 'plugins'))
maxHeapSize = '4G'
}

apply plugin: 'modelcheck'

File modelcheckresult = new File("$buildDir/TEST-checkProject.xml")
Expand Down
25 changes: 16 additions & 9 deletions ...guages/org.iets3.core.expr.simpleTypes/models/org.iets3.core.expr.simpleTypes.actions.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<reference id="5455284157993910961" name="concept" index="2pJxaS" />
<child id="5455284157993911099" name="values" index="2pJxcM" />
</concept>
<concept id="6985522012210254362" name="jetbrains.mps.lang.quotation.structure.NodeBuilderPropertyExpression" flags="nn" index="WxPPo">
<child id="6985522012210254363" name="expression" index="WxPPp" />
</concept>
</language>
<language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
<concept id="1158700664498" name="jetbrains.mps.lang.actions.structure.NodeFactories" flags="ng" index="37WguZ">
Expand Down Expand Up @@ -429,12 +432,14 @@
<ref role="2pJxaS" to="87nw:2dWzqxEBMSc" resolve="Word" />
<node concept="2pJxcG" id="1ikTdkW7bH5" role="2pJxcM">
<ref role="2pJxcJ" to="87nw:2dWzqxEBMSe" resolve="escapedValue" />
<node concept="2OqwBi" id="1ikTdkW6RBA" role="28ntcv">
<node concept="Jnkvi" id="1ikTdkW6RBB" role="2Oq$k0">
<ref role="1M0zk5" node="1ikTdkW6RBG" resolve="stringLiteral" />
</node>
<node concept="3TrcHB" id="1ikTdkW755V" role="2OqNvi">
<ref role="3TsBF5" to="5qo5:4rZeNQ6OYRb" resolve="value" />
<node concept="WxPPo" id="1IVt4400eGC" role="28ntcv">
<node concept="2OqwBi" id="1ikTdkW6RBA" role="WxPPp">
<node concept="Jnkvi" id="1ikTdkW6RBB" role="2Oq$k0">
<ref role="1M0zk5" node="1ikTdkW6RBG" resolve="stringLiteral" />
</node>
<node concept="3TrcHB" id="1ikTdkW755V" role="2OqNvi">
<ref role="3TsBF5" to="5qo5:4rZeNQ6OYRb" resolve="value" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -471,9 +476,11 @@
<ref role="2pJxaS" to="87nw:2dWzqxEBMSc" resolve="Word" />
<node concept="2pJxcG" id="1ikTdkW73vp" role="2pJxcM">
<ref role="2pJxcJ" to="87nw:2dWzqxEBMSe" resolve="escapedValue" />
<node concept="2OqwBi" id="1ikTdkW6REe" role="28ntcv">
<node concept="1r4N5L" id="1ikTdkW6REf" role="2Oq$k0" />
<node concept="2Iv5rx" id="1ikTdkW6REg" role="2OqNvi" />
<node concept="WxPPo" id="1IVt4400eGD" role="28ntcv">
<node concept="2OqwBi" id="1ikTdkW6REe" role="WxPPp">
<node concept="1r4N5L" id="1ikTdkW6REf" role="2Oq$k0" />
<node concept="2Iv5rx" id="1ikTdkW6REg" role="2OqNvi" />
</node>
</node>
</node>
</node>
Expand Down
19 changes: 9 additions & 10 deletions ...tests/generator/template/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,6 @@
<child id="1235573175711" name="elementType" index="2HTBi0" />
<child id="1235573187520" name="singletonValue" index="2HTEbv" />
</concept>
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
<concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
Expand Down Expand Up @@ -2812,17 +2811,17 @@
<node concept="3clFbF" id="5I1s5NvyvqV" role="3cqZAp">
<node concept="2OqwBi" id="5I1s5NvyvUh" role="3clFbG">
<node concept="37vLTw" id="5I1s5NvyvqU" role="2Oq$k0">
<ref role="3cqZAo" node="5I1s5NvyuVx" resolve="it" />
<ref role="3cqZAo" node="1IVt4400jbq" resolve="it" />
</node>
<node concept="3TrEf2" id="3a3EL8S74N7" role="2OqNvi">
<ref role="3Tt5mk" to="as3y:5I1s5NvuWcp" resolve="plugin" />
</node>
</node>
</node>
</node>
<node concept="Rh6nW" id="5I1s5NvyuVx" role="1bW2Oz">
<node concept="gl6BB" id="1IVt4400jbq" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="5I1s5NvyuVy" role="1tU5fm" />
<node concept="2jxLKc" id="1IVt4400jbr" role="1tU5fm" />
</node>
</node>
</node>
Expand Down Expand Up @@ -2960,7 +2959,7 @@
</node>
<node concept="2OqwBi" id="3vNUe1zfYUL" role="3uHU7B">
<node concept="37vLTw" id="3vNUe1zfYhA" role="2Oq$k0">
<ref role="3cqZAo" node="3vNUe1zfXzC" resolve="it" />
<ref role="3cqZAo" node="1IVt4400jbs" resolve="it" />
</node>
<node concept="2Xjw5R" id="3vNUe1zfZC8" role="2OqNvi">
<node concept="1xMEDy" id="3vNUe1zfZCa" role="1xVPHs">
Expand All @@ -2973,9 +2972,9 @@
</node>
</node>
</node>
<node concept="Rh6nW" id="3vNUe1zfXzC" role="1bW2Oz">
<node concept="gl6BB" id="1IVt4400jbs" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="3vNUe1zfXzD" role="1tU5fm" />
<node concept="2jxLKc" id="1IVt4400jbt" role="1tU5fm" />
</node>
</node>
</node>
Expand Down Expand Up @@ -3135,7 +3134,7 @@
<node concept="3clFbC" id="3vNUe1zg4S2" role="3clFbG">
<node concept="2OqwBi" id="3vNUe1zg3qu" role="3uHU7B">
<node concept="37vLTw" id="3vNUe1zg3qv" role="2Oq$k0">
<ref role="3cqZAo" node="3vNUe1zg3qz" resolve="it" />
<ref role="3cqZAo" node="1IVt4400jbu" resolve="it" />
</node>
<node concept="2Xjw5R" id="3vNUe1zg3qw" role="2OqNvi">
<node concept="1xMEDy" id="3vNUe1zg3qx" role="1xVPHs">
Expand All @@ -3151,9 +3150,9 @@
</node>
</node>
</node>
<node concept="Rh6nW" id="3vNUe1zg3qz" role="1bW2Oz">
<node concept="gl6BB" id="1IVt4400jbu" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="3vNUe1zg3q$" role="1tU5fm" />
<node concept="2jxLKc" id="1IVt4400jbv" role="1tU5fm" />
</node>
</node>
</node>
Expand Down
4 changes: 1 addition & 3 deletions ...e/solutions/org.iets3.core.expr.math.interpreter/org.iets3.core.expr.math.interpreter.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@
<facets>
<facet type="java" compile="mps" classes="mps" ext="yes">
<classes generated="true" path="${module}/classes_gen" />
<library location="${module}/lib/big-math.jar" />
</facet>
</facets>
<stubModelEntries>
<stubModelEntry path="${module}/lib/big-math.jar" />
</stubModelEntries>
<dependencies>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>
Expand Down
Loading