From a96cb19d09ee33875155de8cc8d274d477ca1742 Mon Sep 17 00:00:00 2001 From: Ovcharov Alex Date: Mon, 17 Dec 2018 10:45:53 +0300 Subject: [PATCH 01/12] electron fix --- ElectronNetAngular/ElectronNetAngular.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElectronNetAngular/ElectronNetAngular.csproj b/ElectronNetAngular/ElectronNetAngular.csproj index 01ca42b..4cc5292 100644 --- a/ElectronNetAngular/ElectronNetAngular.csproj +++ b/ElectronNetAngular/ElectronNetAngular.csproj @@ -10,9 +10,9 @@ - + From 8a26853a84118c77af84809f8abaafface6d0d64 Mon Sep 17 00:00:00 2001 From: root-server Date: Mon, 17 Dec 2018 11:54:37 +0300 Subject: [PATCH 02/12] Create README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..968d38f --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# hw + +![TeamCity build](http://188.242.47.114:17777/app/rest/builds/buildType:(id:Hw_Build)/statusIcon.svg) From 2498b2aab48a405789b3e31f70bf8e8e4c798be5 Mon Sep 17 00:00:00 2001 From: Super user Date: Mon, 17 Dec 2018 12:04:39 +0300 Subject: [PATCH 03/12] TeamCity change in 'Hw' project: Versioned settings configuration updated --- .teamcity/pom.xml | 104 +++++++++++++++++++++++++++++++++++++++++ .teamcity/settings.kts | 67 ++++++++++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 .teamcity/pom.xml create mode 100644 .teamcity/settings.kts diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml new file mode 100644 index 0000000..92a3cf6 --- /dev/null +++ b/.teamcity/pom.xml @@ -0,0 +1,104 @@ + + + 4.0.0 + Hw Config DSL Script + Hw + Hw_dsl + 1.0-SNAPSHOT + + + org.jetbrains.teamcity + configs-dsl-kotlin-parent + 1.0-SNAPSHOT + + + + + jetbrains-all + http://download.jetbrains.com/teamcity-repository + + true + + + + teamcity-server + http://188.242.47.114:17777/app/dsl-plugins-repository + + true + + + + + + + JetBrains + http://download.jetbrains.com/teamcity-repository + + + + + . + + + kotlin-maven-plugin + org.jetbrains.kotlin + ${kotlin.version} + + + + + compile + process-sources + + compile + + + + test-compile + process-test-sources + + test-compile + + + + + + org.jetbrains.teamcity + teamcity-configs-maven-plugin + ${teamcity.dsl.version} + + kotlin + target/generated-configs + + + + + + + + org.jetbrains.teamcity + configs-dsl-kotlin + ${teamcity.dsl.version} + compile + + + org.jetbrains.teamcity + configs-dsl-kotlin-plugins + 1.0-SNAPSHOT + pom + compile + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + compile + + + org.jetbrains.kotlin + kotlin-script-runtime + ${kotlin.version} + compile + + + \ No newline at end of file diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts new file mode 100644 index 0000000..8d6fff1 --- /dev/null +++ b/.teamcity/settings.kts @@ -0,0 +1,67 @@ +import jetbrains.buildServer.configs.kotlin.v2018_2.* +import jetbrains.buildServer.configs.kotlin.v2018_2.buildSteps.dotnetBuild +import jetbrains.buildServer.configs.kotlin.v2018_2.buildSteps.dotnetRestore +import jetbrains.buildServer.configs.kotlin.v2018_2.triggers.vcs + +/* +The settings script is an entry point for defining a TeamCity +project hierarchy. The script should contain a single call to the +project() function with a Project instance or an init function as +an argument. + +VcsRoots, BuildTypes, Templates, and subprojects can be +registered inside the project using the vcsRoot(), buildType(), +template(), and subProject() methods respectively. + +To debug settings scripts in command-line, run the + + mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate + +command and attach your debugger to the port 8000. + +To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View +-> Tool Windows -> Maven Projects), find the generate task node +(Plugins -> teamcity-configs -> teamcity-configs:generate), the +'Debug' option is available in the context menu for the task. +*/ + +version = "2018.2" + +project { + + buildType(Build) +} + +object Build : BuildType({ + name = "Build" + + allowExternalStatus = true + + vcs { + root(DslContext.settingsRoot) + } + + steps { + dotnetRestore { + name = "nuget restore" + projects = "ElectronNetAngular.sln" + param("dotNetCoverage.dotCover.home.path", "%teamcity.tool.JetBrains.dotCover.CommandLineTools.DEFAULT%") + } + step { + name = "npm ci" + type = "jonnyzzz.npm" + param("teamcity.build.workingDir", "ElectronNetAngular") + param("npm_commands", "ci") + } + dotnetBuild { + name = "dotnet build" + projects = "ElectronNetAngular.sln" + param("dotNetCoverage.dotCover.home.path", "%teamcity.tool.JetBrains.dotCover.CommandLineTools.DEFAULT%") + } + } + + triggers { + vcs { + } + } +}) From 8e8fbbe9acfdb85fcb637700e8f0bcf907d2efed Mon Sep 17 00:00:00 2001 From: Super user Date: Mon, 17 Dec 2018 17:19:41 +0300 Subject: [PATCH 04/12] TeamCity change in 'Hw' project: 'deploy to test' build configuration was created --- .teamcity/patches/buildTypes/DeployToTest.kts | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .teamcity/patches/buildTypes/DeployToTest.kts diff --git a/.teamcity/patches/buildTypes/DeployToTest.kts b/.teamcity/patches/buildTypes/DeployToTest.kts new file mode 100644 index 0000000..fd0d25f --- /dev/null +++ b/.teamcity/patches/buildTypes/DeployToTest.kts @@ -0,0 +1,20 @@ +package patches.buildTypes + +import jetbrains.buildServer.configs.kotlin.v2018_2.* +import jetbrains.buildServer.configs.kotlin.v2018_2.BuildType +import jetbrains.buildServer.configs.kotlin.v2018_2.ui.* + +/* +This patch script was generated by TeamCity on settings change in UI. +To apply the patch, create a buildType with id = 'DeployToTest' +in the root project, and delete the patch script. +*/ +create(DslContext.projectId, BuildType({ + id("DeployToTest") + name = "deploy to test" + + enablePersonalBuilds = false + type = BuildTypeSettings.Type.DEPLOYMENT + maxRunningBuilds = 1 +})) + From a2ca0364146b419072a814f7d3ee7984cda32e7f Mon Sep 17 00:00:00 2001 From: Super user Date: Mon, 17 Dec 2018 17:20:39 +0300 Subject: [PATCH 05/12] TeamCity change in 'Hw' project: snapshot dependency was added in 'deploy to test' build configuration --- .teamcity/patches/buildTypes/DeployToTest.kts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.teamcity/patches/buildTypes/DeployToTest.kts b/.teamcity/patches/buildTypes/DeployToTest.kts index fd0d25f..4bbb0c4 100644 --- a/.teamcity/patches/buildTypes/DeployToTest.kts +++ b/.teamcity/patches/buildTypes/DeployToTest.kts @@ -16,5 +16,12 @@ create(DslContext.projectId, BuildType({ enablePersonalBuilds = false type = BuildTypeSettings.Type.DEPLOYMENT maxRunningBuilds = 1 + + dependencies { + snapshot(RelativeId("Build")) { + onDependencyFailure = FailureAction.CANCEL + onDependencyCancel = FailureAction.CANCEL + } + } })) From de8895c55c93017d6bc90d79e4028c40c4cf714e Mon Sep 17 00:00:00 2001 From: Super user Date: Tue, 18 Dec 2018 10:32:55 +0300 Subject: [PATCH 06/12] TeamCity change in 'Hw' project: runners of 'deploy to test' build configuration were updated --- .teamcity/patches/buildTypes/DeployToTest.kts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.teamcity/patches/buildTypes/DeployToTest.kts b/.teamcity/patches/buildTypes/DeployToTest.kts index 4bbb0c4..445ef1f 100644 --- a/.teamcity/patches/buildTypes/DeployToTest.kts +++ b/.teamcity/patches/buildTypes/DeployToTest.kts @@ -2,6 +2,7 @@ package patches.buildTypes import jetbrains.buildServer.configs.kotlin.v2018_2.* import jetbrains.buildServer.configs.kotlin.v2018_2.BuildType +import jetbrains.buildServer.configs.kotlin.v2018_2.buildSteps.powerShell import jetbrains.buildServer.configs.kotlin.v2018_2.ui.* /* @@ -17,6 +18,15 @@ create(DslContext.projectId, BuildType({ type = BuildTypeSettings.Type.DEPLOYMENT maxRunningBuilds = 1 + steps { + powerShell { + name = "deployment logic" + scriptMode = script { + content = "echo 'Deploy to Test'" + } + } + } + dependencies { snapshot(RelativeId("Build")) { onDependencyFailure = FailureAction.CANCEL From bb582f820acc67cae90b6e00b34853710957b11a Mon Sep 17 00:00:00 2001 From: Super user Date: Tue, 18 Dec 2018 10:33:15 +0300 Subject: [PATCH 07/12] TeamCity change in 'Hw' project: 'deploy to local machine' build configuration was created --- .../buildTypes/DeployToLocalMachine.kts | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .teamcity/patches/buildTypes/DeployToLocalMachine.kts diff --git a/.teamcity/patches/buildTypes/DeployToLocalMachine.kts b/.teamcity/patches/buildTypes/DeployToLocalMachine.kts new file mode 100644 index 0000000..9a468b2 --- /dev/null +++ b/.teamcity/patches/buildTypes/DeployToLocalMachine.kts @@ -0,0 +1,20 @@ +package patches.buildTypes + +import jetbrains.buildServer.configs.kotlin.v2018_2.* +import jetbrains.buildServer.configs.kotlin.v2018_2.BuildType +import jetbrains.buildServer.configs.kotlin.v2018_2.ui.* + +/* +This patch script was generated by TeamCity on settings change in UI. +To apply the patch, create a buildType with id = 'DeployToLocalMachine' +in the root project, and delete the patch script. +*/ +create(DslContext.projectId, BuildType({ + id("DeployToLocalMachine") + name = "deploy to local machine" + + enablePersonalBuilds = false + type = BuildTypeSettings.Type.DEPLOYMENT + maxRunningBuilds = 1 +})) + From 2111f5b50af7ca735ad2f2924706e52b534a89d5 Mon Sep 17 00:00:00 2001 From: Super user Date: Tue, 18 Dec 2018 10:33:50 +0300 Subject: [PATCH 08/12] TeamCity change in 'Hw' project: runners of 'deploy to local machine' build configuration were updated --- .teamcity/patches/buildTypes/DeployToLocalMachine.kts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.teamcity/patches/buildTypes/DeployToLocalMachine.kts b/.teamcity/patches/buildTypes/DeployToLocalMachine.kts index 9a468b2..5341ce5 100644 --- a/.teamcity/patches/buildTypes/DeployToLocalMachine.kts +++ b/.teamcity/patches/buildTypes/DeployToLocalMachine.kts @@ -2,6 +2,7 @@ package patches.buildTypes import jetbrains.buildServer.configs.kotlin.v2018_2.* import jetbrains.buildServer.configs.kotlin.v2018_2.BuildType +import jetbrains.buildServer.configs.kotlin.v2018_2.buildSteps.powerShell import jetbrains.buildServer.configs.kotlin.v2018_2.ui.* /* @@ -16,5 +17,14 @@ create(DslContext.projectId, BuildType({ enablePersonalBuilds = false type = BuildTypeSettings.Type.DEPLOYMENT maxRunningBuilds = 1 + + steps { + powerShell { + name = "deployment logic" + scriptMode = script { + content = "echo 'Deploy to local machine'" + } + } + } })) From b47502077961620757ab3298c8c814a57409b455 Mon Sep 17 00:00:00 2001 From: Super user Date: Tue, 18 Dec 2018 10:33:59 +0300 Subject: [PATCH 09/12] TeamCity change in 'Hw' project: snapshot dependency was added in 'deploy to local machine' build configuration --- .teamcity/patches/buildTypes/DeployToLocalMachine.kts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.teamcity/patches/buildTypes/DeployToLocalMachine.kts b/.teamcity/patches/buildTypes/DeployToLocalMachine.kts index 5341ce5..489b009 100644 --- a/.teamcity/patches/buildTypes/DeployToLocalMachine.kts +++ b/.teamcity/patches/buildTypes/DeployToLocalMachine.kts @@ -26,5 +26,10 @@ create(DslContext.projectId, BuildType({ } } } + + dependencies { + snapshot(RelativeId("Build")) { + } + } })) From 5e72a32e4990d6b07f76bc9729759af043cf222b Mon Sep 17 00:00:00 2001 From: Super user Date: Tue, 18 Dec 2018 10:34:15 +0300 Subject: [PATCH 10/12] TeamCity change in 'Hw' project: snapshot dependency was added in 'deploy to local machine' build configuration --- .teamcity/patches/buildTypes/DeployToLocalMachine.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.teamcity/patches/buildTypes/DeployToLocalMachine.kts b/.teamcity/patches/buildTypes/DeployToLocalMachine.kts index 489b009..c08c290 100644 --- a/.teamcity/patches/buildTypes/DeployToLocalMachine.kts +++ b/.teamcity/patches/buildTypes/DeployToLocalMachine.kts @@ -29,6 +29,8 @@ create(DslContext.projectId, BuildType({ dependencies { snapshot(RelativeId("Build")) { + onDependencyFailure = FailureAction.CANCEL + onDependencyCancel = FailureAction.CANCEL } } })) From a251cea99e7d3b7e04c55d9b7ac989c8c39f3ab4 Mon Sep 17 00:00:00 2001 From: Ovcharov Alex Date: Wed, 19 Dec 2018 14:43:11 +0300 Subject: [PATCH 11/12] test --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index de1f051..b271e0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /Properties/launchSettings.json - +## test ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. From f1e91445cde3e4eb72aeb2967ba7faf9f477542f Mon Sep 17 00:00:00 2001 From: Ovcharov Alex Date: Wed, 19 Dec 2018 14:43:11 +0300 Subject: [PATCH 12/12] test2 --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index de1f051..6698fa7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /Properties/launchSettings.json - +## test2 ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons.