diff --git a/Build/bamboo/pom.xml b/Build/bamboo/pom.xml index 8a8e0542eebb938c46a20d684a4bd3f47a5652ed..757de5d6e831960385a07a561e9e9c60a2da333e 100644 --- a/Build/bamboo/pom.xml +++ b/Build/bamboo/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>com.atlassian.bamboo</groupId> <artifactId>bamboo-specs-parent</artifactId> - <version>6.2.2</version> + <version>6.3.1</version> <relativePath/> </parent> diff --git a/Build/bamboo/src/main/java/core/AbstractCoreSpec.java b/Build/bamboo/src/main/java/core/AbstractCoreSpec.java index 9dab9e16a84ef0fecc2d057c9e172ca5a2c8efe0..abac094e11176c4e1648724558f1be6fb4d40590 100644 --- a/Build/bamboo/src/main/java/core/AbstractCoreSpec.java +++ b/Build/bamboo/src/main/java/core/AbstractCoreSpec.java @@ -45,7 +45,7 @@ abstract public class AbstractCoreSpec { protected static String projectName = "TYPO3 Core"; protected static String projectKey = "CORE"; - protected String composerRootVersionEnvironment = "COMPOSER_ROOT_VERSION=9.0.0"; + protected String composerRootVersionEnvironment = "COMPOSER_ROOT_VERSION=9.1.0"; protected String testingFrameworkBuildPath = "vendor/typo3/testing-framework/Resources/Core/Build/"; @@ -593,7 +593,7 @@ abstract public class AbstractCoreSpec { */ protected Job getJobLintScssTs() { return new Job("Lint scss ts", new BambooKey("LSTS")) - .description("Run npm lint in Build/ dir") + .description("Run npm lint, run npm run build-js") .pluginConfigurations(this.getDefaultJobPluginConfiguration()) .tasks( this.getTaskGitCloneRepository(), @@ -610,7 +610,19 @@ abstract public class AbstractCoreSpec { .description("Run npm lint") .nodeExecutable("Node.js") .workingSubdirectory("Build/") - .command("run lint") + .command("run lint"), + new NpmTask() + .description("Run npm build-js") + .nodeExecutable("Node.js") + .workingSubdirectory("Build/") + .command("run build-js"), + new ScriptTask() + .description("git status to check for changed files after build-js") + .interpreter(ScriptTaskProperties.Interpreter.BINSH_OR_CMDEXE) + .inlineBody( + this.getScriptTaskBashInlineBody() + + "git status | grep -q \"nothing to commit, working directory clean\"" + ) ) .requirements( new Requirement("system.imageVersion")