From 742d4a8e4edadf9d2df4aa335711820282630cdb Mon Sep 17 00:00:00 2001 From: Marc Hermans Date: Thu, 19 May 2022 10:51:05 +0200 Subject: [PATCH 1/2] Update the used container, for good measure. Mark the running user as root, to be able to run npm builds. --- .teamcity/settings.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts index b02fea503..678940b91 100644 --- a/.teamcity/settings.kts +++ b/.teamcity/settings.kts @@ -34,11 +34,12 @@ project { params { text("docker_jdk_version", "8", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false) - text("docker_gradle_version", "7.2", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false) + text("docker_gradle_version", "7.4.2", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false) text("git_main_branch", "master", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false) text("github_repository_name", "reposilite", label = "The github repository name. Used to connect to it in VCS Roots.", description = "This is the repository slug on github. So for example `reposilite` or `MinecraftForge`. It is interpolated into the global VCS Roots.", display = ParameterDisplay.HIDDEN, allowEmpty = false) text("env.PUBLISHED_JAVA_ARTIFACT_ID", "reposilite", label = "Published artifact id", description = "The maven coordinate artifact id that has been published by this build. Can not be empty.", allowEmpty = false) text("env.PUBLISHED_JAVA_GROUP", "net.minecraftforge", label = "Published group", description = "The maven coordinate group that has been published by this build. Can not be empty.", allowEmpty = false) + param("docker_additional_args", "-u 0") } features { From 56bbc1ae28f30d05c01f298b3abc534ac1818848 Mon Sep 17 00:00:00 2001 From: Marc Hermans Date: Thu, 19 May 2022 11:06:07 +0200 Subject: [PATCH 2/2] Fix versioning output on teamcity, while the frontend project does not have a version set. Force the same version across all projects. --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index 93a1b6cf2..964afcd60 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,9 @@ plugins { evaluationDependsOnChildren() +def rootProjectVersion = gradleutils.getTagOffsetVersion() +allprojects {pro -> pro.version = rootProjectVersion} + composeBuild { dependsOn(':backend:shadowJar') doFirst {