Skip to content

Build improvements #748

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
sergej-koscejev merged 3 commits into from
Jan 28, 2024
Merged

Build improvements #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
860778a
Simplify build
sergej-koscejev Jan 26, 2024
5ff941f
Disable incremental build
sergej-koscejev Jan 28, 2024
a315b8b
Fail build when tests fail
sergej-koscejev Jan 28, 2024
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
26 changes: 4 additions & 22 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
plugins {
id 'de.itemis.mps.gradle.common' version '1.13.+'
id "com.github.breadmoirai.github-release" version "2.4.1"
id 'maven-publish'
id 'base'
}

apply plugin: 'maven-publish'
apply plugin: 'base'



import de.itemis.mps.gradle.*

import java.time.LocalDateTime


wrapper {
gradleVersion '7.4.1'
distributionType 'all'
}

// detect if we are in a CI build
if (project.hasProperty("forceCI")) {
ext.ciBuild = true
Expand Down Expand Up @@ -62,9 +53,6 @@ if (!project.hasProperty('nexusUsername')) {
}
logger.info 'Repository username: {}', project.nexusUsername

ext.dependencyRepositories = [
'https://artifacts.itemis.cloud/repository/maven-mps/'
]
// Dependency versions

// major version, e.g. '2021.1', '2021.2'
Expand Down Expand Up @@ -123,12 +111,7 @@ dependencies {
}

repositories {
mavenLocal()
for (repoUrl in project.dependencyRepositories) {
maven {
url repoUrl
}
}
maven { url 'https://artifacts.itemis.cloud/repository/maven-mps/' }
}

ext.skipResolveMps = project.hasProperty('mpsHomeDir')
Expand Down Expand Up @@ -215,14 +198,13 @@ ext.artifacts_dir = '-Dartifacts.root=' + artifactsDir
ext.pluginVersion = "-DversionNumber=" + version
ext.buildDate = "-DbuildDate=" + new Date().toString()
ext.extensions_home = '-Dextensions.home=' + rootDir
ext.skipUnmodifiedModels = "-Dmps.generator.skipUnmodifiedModels=true" //incremental build support

// ___________________ utilities ___________________
File scriptFile(String relativePath) {
new File("$rootDir/build/generated/$relativePath")
}

def defaultScriptArgs = [mps_home, build_dir, artifacts_dir, ext.buildDate, ext.pluginVersion, ext.skipUnmodifiedModels]
def defaultScriptArgs = [mps_home, build_dir, artifacts_dir, ext.buildDate, ext.pluginVersion]

// enables https://github.com/mbeddr/mps-gradle-plugin#providing-global-defaults
ext["itemis.mps.gradle.ant.defaultScriptArgs"] = defaultScriptArgs
Expand Down
36 changes: 21 additions & 15 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<reference id="4560297596904469363" name="module" index="22LTRN" />
</concept>
<concept id="6593674873639474400" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModules_Options" flags="ng" index="24cAiW">
<child id="6593674873639478221" name="haltonfailure" index="24c_eh" />
<child id="1688667350638517006" name="compressArgs" index="XX84c" />
</concept>
<concept id="4005526075820600484" name="jetbrains.mps.build.mps.tests.structure.BuildModuleTestsPlugin" flags="ng" index="1gjT0q" />
Expand Down Expand Up @@ -929,16 +930,6 @@
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="34iPpyhNGWr" role="3bR37C">
<node concept="1BurEX" id="34iPpyhNGWs" role="1SiIV1">
<node concept="398BVA" id="34iPpyhNGWd" role="1BurEY">
<ref role="398BVh" node="5Ngh5kRcxhz" resolve="platform_lib" />
<node concept="2Ry0Ak" id="34iPpyhNGWe" role="iGT6I">
<property role="2Ry0Am" value="3rd-party.jar" />
</node>
</node>
</node>
</node>
<node concept="3rtmxn" id="7LJ_vJOlQ5R" role="3bR31x">
<node concept="3LXTmp" id="7LJ_vJOlQ5S" role="3rtmxm">
<node concept="3qWCbU" id="7LJ_vJOlQ5T" role="3LXTna">
Expand All @@ -958,6 +949,16 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="34iPpyhNGWr" role="3bR37C">
<node concept="1BurEX" id="34iPpyhNGWs" role="1SiIV1">
<node concept="398BVA" id="34iPpyhNGWd" role="1BurEY">
<ref role="398BVh" node="5Ngh5kRcxhz" resolve="platform_lib" />
<node concept="2Ry0Ak" id="34iPpyhNGWe" role="iGT6I">
<property role="2Ry0Am" value="3rd-party.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="m$_wf" id="31bAEZ0srEa" role="3989C9">
Expand Down Expand Up @@ -13156,11 +13157,6 @@
<node concept="1E0d5M" id="52ZF9D3h0uS" role="1E1XAP">
<ref role="1E0d5P" node="52ZF9D3gLhJ" resolve="com.mbeddr.mpsutil.modellisteners.runtime" />
</node>
<node concept="1SiIV0" id="52ZF9D3h0uT" role="3bR37C">
<node concept="1Busua" id="52ZF9D3h0uU" role="1SiIV1">
<ref role="1Busuk" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
</node>
</node>
<node concept="1yeLz9" id="52ZF9D3h0uV" role="1TViLv">
<property role="TrG5h" value="com.mbeddr.mpsutil.modellisteners#5818559022136673503" />
<property role="3LESm3" value="37132e31-f64c-4798-8f65-d49942f5121d" />
Expand Down Expand Up @@ -13201,6 +13197,11 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="52ZF9D3h0uT" role="3bR37C">
<node concept="1Busua" id="52ZF9D3h0uU" role="1SiIV1">
<ref role="1Busuk" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
</node>
</node>
<node concept="1SiIV0" id="3AI_UIpOEou" role="3bR37C">
<node concept="1Busua" id="3AI_UIpOEov" role="1SiIV1">
<ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
Expand Down Expand Up @@ -19867,6 +19868,11 @@
<property role="3MwjfP" value="true" />
</node>
</node>
<node concept="NbPM2" id="4rjYge50oSR" role="24c_eh">
<node concept="3Mxwew" id="4rjYge50oSU" role="3MwsjC">
<property role="3MwjfP" value="true" />
</node>
</node>
</node>
<node concept="22LTRM" id="5QP6xyk3oDX" role="22LTRK">
<ref role="22LTRN" node="5QP6xyk3oCB" resolve="test.de.q60.mps.shadowmodels.runtime" />
Expand Down