This repository was archived by the owner on Jun 22, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
test2 #3
Open
root-server
wants to merge
14
commits into
master
Choose a base branch
from
test2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
test2 #3
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
a96cb19
electron fix
8a26853
Create README.md
root-server 2498b2a
TeamCity change in 'Hw' project: Versioned settings configuration upd…
8e8fbbe
TeamCity change in 'Hw' project: 'deploy to test' build configuration…
a2ca036
TeamCity change in 'Hw' project: snapshot dependency was added in 'de…
de8895c
TeamCity change in 'Hw' project: runners of 'deploy to test' build co…
bb582f8
TeamCity change in 'Hw' project: 'deploy to local machine' build conf…
2111f5b
TeamCity change in 'Hw' project: runners of 'deploy to local machine'…
b475020
TeamCity change in 'Hw' project: snapshot dependency was added in 'de…
5e72a32
TeamCity change in 'Hw' project: snapshot dependency was added in 'de…
a251cea
test
f1e9144
test2
63cb097
Merge pull request #4 from root-server/test
root-server a82ee72
Merge branch 'master' into test2
root-server File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| 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.* | ||
|
|
||
| /* | ||
| 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 | ||
|
|
||
| steps { | ||
| powerShell { | ||
| name = "deployment logic" | ||
| scriptMode = script { | ||
| content = "echo 'Deploy to local machine'" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| snapshot(RelativeId("Build")) { | ||
| onDependencyFailure = FailureAction.CANCEL | ||
| onDependencyCancel = FailureAction.CANCEL | ||
| } | ||
| } | ||
| })) | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| 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.* | ||
|
|
||
| /* | ||
| 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 | ||
|
|
||
| steps { | ||
| powerShell { | ||
| name = "deployment logic" | ||
| scriptMode = script { | ||
| content = "echo 'Deploy to Test'" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| snapshot(RelativeId("Build")) { | ||
| onDependencyFailure = FailureAction.CANCEL | ||
| onDependencyCancel = FailureAction.CANCEL | ||
| } | ||
| } | ||
| })) | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| <?xml version="1.0"?> | ||
| <project> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <name>Hw Config DSL Script</name> | ||
| <groupId>Hw</groupId> | ||
| <artifactId>Hw_dsl</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
|
|
||
| <parent> | ||
| <groupId>org.jetbrains.teamcity</groupId> | ||
| <artifactId>configs-dsl-kotlin-parent</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <repositories> | ||
| <repository> | ||
| <id>jetbrains-all</id> | ||
| <url>http://download.jetbrains.com/teamcity-repository</url> | ||
| <snapshots> | ||
| <enabled>true</enabled> | ||
| </snapshots> | ||
| </repository> | ||
| <repository> | ||
| <id>teamcity-server</id> | ||
| <url>http://188.242.47.114:17777/app/dsl-plugins-repository</url> | ||
| <snapshots> | ||
| <enabled>true</enabled> | ||
| </snapshots> | ||
| </repository> | ||
| </repositories> | ||
|
|
||
| <pluginRepositories> | ||
| <pluginRepository> | ||
| <id>JetBrains</id> | ||
| <url>http://download.jetbrains.com/teamcity-repository</url> | ||
| </pluginRepository> | ||
| </pluginRepositories> | ||
|
|
||
| <build> | ||
| <sourceDirectory>.</sourceDirectory> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>kotlin-maven-plugin</artifactId> | ||
| <groupId>org.jetbrains.kotlin</groupId> | ||
| <version>${kotlin.version}</version> | ||
|
|
||
| <configuration/> | ||
| <executions> | ||
| <execution> | ||
| <id>compile</id> | ||
| <phase>process-sources</phase> | ||
| <goals> | ||
| <goal>compile</goal> | ||
| </goals> | ||
| </execution> | ||
| <execution> | ||
| <id>test-compile</id> | ||
| <phase>process-test-sources</phase> | ||
| <goals> | ||
| <goal>test-compile</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.jetbrains.teamcity</groupId> | ||
| <artifactId>teamcity-configs-maven-plugin</artifactId> | ||
| <version>${teamcity.dsl.version}</version> | ||
| <configuration> | ||
| <format>kotlin</format> | ||
| <dstDir>target/generated-configs</dstDir> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.jetbrains.teamcity</groupId> | ||
| <artifactId>configs-dsl-kotlin</artifactId> | ||
| <version>${teamcity.dsl.version}</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jetbrains.teamcity</groupId> | ||
| <artifactId>configs-dsl-kotlin-plugins</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <type>pom</type> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jetbrains.kotlin</groupId> | ||
| <artifactId>kotlin-stdlib-jdk8</artifactId> | ||
| <version>${kotlin.version}</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jetbrains.kotlin</groupId> | ||
| <artifactId>kotlin-script-runtime</artifactId> | ||
| <version>${kotlin.version}</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 { | ||
| } | ||
| } | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # hw | ||
|
|
||
| /statusIcon.svg) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
asdasd