From e49a347aea3f2d9ad7175ebcae857c113e63117e Mon Sep 17 00:00:00 2001 From: cpw Date: Sun, 16 Jan 2022 18:07:25 -0500 Subject: [PATCH] add extra keystore properties Signed-off-by: cpw --- .teamcity/patches/projects/_Self.kts | 35 ---------------------------- .teamcity/settings.kts | 6 +++-- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 .teamcity/patches/projects/_Self.kts diff --git a/.teamcity/patches/projects/_Self.kts b/.teamcity/patches/projects/_Self.kts deleted file mode 100644 index 0039e43d21..0000000000 --- a/.teamcity/patches/projects/_Self.kts +++ /dev/null @@ -1,35 +0,0 @@ -package patches.projects - -import jetbrains.buildServer.configs.kotlin.v2019_2.* -import jetbrains.buildServer.configs.kotlin.v2019_2.Project -import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.GitHubIssueTracker -import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.githubIssues -import jetbrains.buildServer.configs.kotlin.v2019_2.ui.* - -/* -This patch script was generated by TeamCity on settings change in UI. -To apply the patch, change the root project -accordingly, and delete the patch script. -*/ -changeProject(DslContext.projectId) { - params { - add { - password("env.KEYSTORE_URL", "credentialsJSON:a7ae1c82-8058-4061-8d12-7f6bc2618d2e", display = ParameterDisplay.HIDDEN) - } - add { - password("env.KEYSTORE_PASSWORD", "credentialsJSON:d7b964e3-a1fd-47a8-b892-6f601fe47479", display = ParameterDisplay.HIDDEN) - } - } - - features { - val feature1 = find { - githubIssues { - id = "MinecraftForge_MinecraftForge__IssueTracker" - displayName = "MinecraftForge/MinecraftForge" - repositoryURL = "https://github.com/MinecraftForge/MinecraftForge" - } - } - feature1.apply { - } - } -} diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts index c95e9284ee..1fc8a0a42e 100644 --- a/.teamcity/settings.kts +++ b/.teamcity/settings.kts @@ -46,9 +46,11 @@ project { text("env.PUBLISHED_JAVA_FML_ARTIFACT_ID", "fmlonly", label = "Published fmlonly artifact id", description = "The maven coordinate artifact id for fml only that has been published by this build. Can not be empty.", allowEmpty = false) text("env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION", "0.0.0-SNAPSHOT", label = "Published fmlonly artifact version", description = "The version for fml only 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) - //This is a reference and not actually a key. + //These are references and not actually keys password("env.CROWDIN_KEY", "credentialsJSON:a3102dbe-805d-4177-9f54-3d2c2eb08fd5", display = ParameterDisplay.HIDDEN) - text("additional_publishing_gradle_parameters", "-PcrowdinKey=%env.CROWDIN_KEY%", label = "Additional gradle parameters for publish", description = "Contains the additional gradle parameters used during publishing.", display = ParameterDisplay.HIDDEN, allowEmpty = true) + password("env.KEYSTORE_URL", "credentialsJSON:a7ae1c82-8058-4061-8d12-7f6bc2618d2e", display = ParameterDisplay.HIDDEN) + password("env.KEYSTORE_PASSWORD", "credentialsJSON:d7b964e3-a1fd-47a8-b892-6f601fe47479", display = ParameterDisplay.HIDDEN) + text("additional_publishing_gradle_parameters", "-PcrowdinKey=%env.CROWDIN_KEY% -PkeystoreKeyPass=%env.KEYSTORE_PASSWORD% -PkeystoreStorePass=%env.KEYSTORE_PASSWORD% -Pkeystore=%env.KEYSTORE_URL%", label = "Additional gradle parameters for publish", description = "Contains the additional gradle parameters used during publishing.", display = ParameterDisplay.HIDDEN, allowEmpty = true) checkbox("should_execute_build", "false", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN, checked = "true", unchecked = "false")