Merge branch 'master' into html

This commit is contained in:
Hypnosphi 2018-04-23 00:04:22 +03:00
commit 9be6965838
11 changed files with 127 additions and 486 deletions

View File

@ -27,14 +27,13 @@ object Project : Project({
buildType(OpenSourceProjects_Storybook_CliTest)
buildType(OpenSourceProjects_Storybook_Test)
buildType(OpenSourceProjects_Storybook_Lint)
buildType(OpenSourceProjects_Storybook_CRA)
buildType(OpenSourceProjects_Storybook_Vue)
buildType(OpenSourceProjects_Storybook_Angular)
buildType(OpenSourceProjects_Storybook_Polymer)
buildType(OpenSourceProjects_Storybook_Mithril)
buildType(OpenSourceProjects_Storybook_SmokeTests)
buildType(OpenSourceProjects_Storybook_Chromatic)
allApps {
buildType(config)
}
features {
versionedSettings {
id = "PROJECT_EXT_258"
@ -45,6 +44,24 @@ object Project : Project({
settingsFormat = VersionedSettings.Format.KOTLIN
storeSecureParamsOutsideOfVcs = true
}
feature {
type = "buildtype-graphs"
id = "PROJECT_EXT_132"
param("series", """
[
{
"type": "valueType",
"title": "Build Duration (all stages)",
"key": "BuildDuration"
}
]
""".trimIndent())
param("format", "duration")
param("hideFilters", "")
param("title", "Build Duration")
param("defaultFilters", "")
param("seriesTitle", "Serie")
}
feature {
id = "PROJECT_EXT_259"
type = "IssueTracker"

View File

@ -1,71 +0,0 @@
package OpenSourceProjects_Storybook.buildTypes
import jetbrains.buildServer.configs.kotlin.v2017_2.*
import jetbrains.buildServer.configs.kotlin.v2017_2.buildFeatures.commitStatusPublisher
import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.script
import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.BuildFailureOnMetric
import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.failOnMetricChange
object OpenSourceProjects_Storybook_Angular : BuildType({
uuid = "8cc5f747-4ca7-4f0d-940d-b0c422f501a6-angular"
id = "OpenSourceProjects_Storybook_Angular"
name = "Angular"
artifactRules = "examples/angular-cli/storybook-static => angular.zip"
vcs {
root(OpenSourceProjects_Storybook.vcsRoots.OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster)
}
steps {
script {
name = "Bootstrap"
scriptContent = """
yarn
yarn bootstrap --core
""".trimIndent()
dockerImage = "node:latest"
}
script {
name = "build"
scriptContent = """
#!/bin/sh
set -e -x
cd examples/angular-cli
yarn build-storybook
""".trimIndent()
dockerImage = "node:latest"
}
}
failureConditions {
failOnMetricChange {
metric = BuildFailureOnMetric.MetricType.ARTIFACT_SIZE
threshold = 50
units = BuildFailureOnMetric.MetricUnit.PERCENTS
comparison = BuildFailureOnMetric.MetricComparison.LESS
compareTo = build {
buildRule = lastSuccessful()
}
}
}
features {
commitStatusPublisher {
publisher = github {
githubUrl = "https://api.github.com"
authType = personalToken {
token = "credentialsJSON:5ffe2d7e-531e-4f6f-b1fc-a41bfea26eaa"
}
}
param("github_oauth_user", "Hypnosphi")
}
}
requirements {
doesNotContain("env.OS", "Windows")
}
})

View File

@ -0,0 +1,85 @@
package OpenSourceProjects_Storybook.buildTypes
import jetbrains.buildServer.configs.kotlin.v2017_2.*
import jetbrains.buildServer.configs.kotlin.v2017_2.buildFeatures.commitStatusPublisher
import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.script
import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.BuildFailureOnMetric
import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.failOnMetricChange
enum class StorybookApp(val appName: String, val exampleDir: String) {
CRA("CRA", "cra-kitchen-sink"),
VUE("Vue", "vue-kitchen-sink"),
ANGULAR("Angular", "angular-cli"),
POLYMER("Polymer", "polymer-cli"),
MITHRIL("Mithril", "mithril-kitchen-sink");
val lowerName = appName.toLowerCase()
val artifactPath = "examples/$exampleDir/storybook-static => $lowerName.zip"
val config = object : BuildType({
uuid = "8cc5f747-4ca7-4f0d-940d-b0c422f501a6-$lowerName"
id = "OpenSourceProjects_Storybook_$appName"
name = appName
artifactRules = artifactPath
vcs {
root(OpenSourceProjects_Storybook.vcsRoots.OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster)
}
steps {
script {
name = "Bootstrap"
scriptContent = """
yarn
yarn bootstrap --core
""".trimIndent()
dockerImage = "node:latest"
}
script {
name = "build"
scriptContent = """
#!/bin/sh
set -e -x
cd examples/$exampleDir
yarn build-storybook
""".trimIndent()
dockerImage = "node:latest"
}
}
failureConditions {
failOnMetricChange {
metric = BuildFailureOnMetric.MetricType.ARTIFACT_SIZE
threshold = 50
units = BuildFailureOnMetric.MetricUnit.PERCENTS
comparison = BuildFailureOnMetric.MetricComparison.LESS
compareTo = build {
buildRule = lastSuccessful()
}
}
}
features {
commitStatusPublisher {
publisher = github {
githubUrl = "https://api.github.com"
authType = personalToken {
token = "credentialsJSON:5ffe2d7e-531e-4f6f-b1fc-a41bfea26eaa"
}
}
param("github_oauth_user", "Hypnosphi")
}
}
requirements {
doesNotContain("env.OS", "Windows")
}
}) {}
}
fun allApps(handler: StorybookApp.() -> Unit) =
StorybookApp.values().forEach { it.handler() }

View File

@ -1,71 +0,0 @@
package OpenSourceProjects_Storybook.buildTypes
import jetbrains.buildServer.configs.kotlin.v2017_2.*
import jetbrains.buildServer.configs.kotlin.v2017_2.buildFeatures.commitStatusPublisher
import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.script
import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.BuildFailureOnMetric
import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.failOnMetricChange
object OpenSourceProjects_Storybook_CRA : BuildType({
uuid = "8cc5f747-4ca7-4f0d-940d-b0c422f501a6-cra"
id = "OpenSourceProjects_Storybook_CRA"
name = "CRA"
artifactRules = "examples/cra-kitchen-sink/storybook-static => cra.zip"
vcs {
root(OpenSourceProjects_Storybook.vcsRoots.OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster)
}
steps {
script {
name = "Bootstrap"
scriptContent = """
yarn
yarn bootstrap --core
""".trimIndent()
dockerImage = "node:latest"
}
script {
name = "build"
scriptContent = """
#!/bin/sh
set -e -x
cd examples/cra-kitchen-sink
yarn build-storybook
""".trimIndent()
dockerImage = "node:latest"
}
}
failureConditions {
failOnMetricChange {
metric = BuildFailureOnMetric.MetricType.ARTIFACT_SIZE
threshold = 50
units = BuildFailureOnMetric.MetricUnit.PERCENTS
comparison = BuildFailureOnMetric.MetricComparison.LESS
compareTo = build {
buildRule = lastSuccessful()
}
}
}
features {
commitStatusPublisher {
publisher = github {
githubUrl = "https://api.github.com"
authType = personalToken {
token = "credentialsJSON:5ffe2d7e-531e-4f6f-b1fc-a41bfea26eaa"
}
}
param("github_oauth_user", "Hypnosphi")
}
}
requirements {
doesNotContain("env.OS", "Windows")
}
})

View File

@ -45,49 +45,15 @@ object OpenSourceProjects_Storybook_Chromatic : BuildType({
}
dependencies {
dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_CRA) {
snapshot {
onDependencyCancel = FailureAction.CANCEL
}
allApps {
dependency(config) {
snapshot {
onDependencyCancel = FailureAction.CANCEL
}
artifacts {
artifactRules = "cra.zip!** => examples/cra-kitchen-sink/storybook-static"
}
}
dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Vue) {
snapshot {
onDependencyCancel = FailureAction.CANCEL
}
artifacts {
artifactRules = "vue.zip!** => examples/vue-kitchen-sink/storybook-static"
}
}
dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Angular) {
snapshot {
onDependencyCancel = FailureAction.CANCEL
}
artifacts {
artifactRules = "angular.zip!** => examples/angular-cli/storybook-static"
}
}
dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Polymer) {
snapshot {
onDependencyCancel = FailureAction.CANCEL
}
artifacts {
artifactRules = "polymer.zip!** => examples/polymer-cli/storybook-static"
}
}
dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Mithril) {
snapshot {
onDependencyCancel = FailureAction.CANCEL
}
artifacts {
artifactRules = "mithril.zip!** => examples/mithril-kitchen-sink/storybook-static"
artifacts {
artifactRules = "$lowerName.zip!** => examples/$exampleDir/storybook-static"
}
}
}
}

View File

@ -11,13 +11,8 @@ object OpenSourceProjects_Storybook_Examples : BuildType({
id = "OpenSourceProjects_Storybook_Examples"
name = "Examples"
artifactRules = """
artifactRules = StorybookApp.values().map { it.artifactPath }.joinToString("\n") + """
examples/official-storybook/storybook-static => official.zip
examples/angular-cli/storybook-static => angular.zip
examples/polymer-cli/storybook-static => polymer.zip
examples/cra-kitchen-sink/storybook-static => cra.zip
examples/mithril-kitchen-sink/storybook-static => mithril.zip
examples/vue-kitchen-sink/storybook-static => vue.zip
examples/official-storybook/image-snapshots/__image_snapshots__ => image-snapshots
""".trimIndent()
@ -43,6 +38,7 @@ object OpenSourceProjects_Storybook_Examples : BuildType({
set -e -x
cd examples/official-storybook
rm -rf storybook-static
yarn build-storybook
""".trimIndent()
dockerImage = "node:latest"
@ -93,49 +89,16 @@ object OpenSourceProjects_Storybook_Examples : BuildType({
}
dependencies {
dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_CRA) {
snapshot {
onDependencyCancel = FailureAction.CANCEL
}
allApps {
dependency(config) {
snapshot {
onDependencyCancel = FailureAction.CANCEL
}
artifacts {
artifactRules = "cra.zip!** => examples/cra-kitchen-sink/storybook-static"
}
}
dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Vue) {
snapshot {
onDependencyCancel = FailureAction.CANCEL
}
artifacts {
artifactRules = "vue.zip!** => examples/vue-kitchen-sink/storybook-static"
}
}
dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Angular) {
snapshot {
onDependencyCancel = FailureAction.CANCEL
}
artifacts {
artifactRules = "angular.zip!** => examples/angular-cli/storybook-static"
}
}
dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Polymer) {
snapshot {
onDependencyCancel = FailureAction.CANCEL
}
artifacts {
artifactRules = "polymer.zip!** => examples/polymer-cli/storybook-static"
}
}
dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Mithril) {
snapshot {
onDependencyCancel = FailureAction.CANCEL
}
artifacts {
artifactRules = "mithril.zip!** => examples/mithril-kitchen-sink/storybook-static"
artifacts {
cleanDestination = true
artifactRules = "$lowerName.zip!** => examples/$exampleDir/storybook-static"
}
}
}
}

View File

@ -1,71 +0,0 @@
package OpenSourceProjects_Storybook.buildTypes
import jetbrains.buildServer.configs.kotlin.v2017_2.*
import jetbrains.buildServer.configs.kotlin.v2017_2.buildFeatures.commitStatusPublisher
import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.script
import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.BuildFailureOnMetric
import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.failOnMetricChange
object OpenSourceProjects_Storybook_Mithril : BuildType({
uuid = "8cc5f747-4ca7-4f0d-940d-b0c422f501a6-mithril"
id = "OpenSourceProjects_Storybook_Mithril"
name = "Mithril"
artifactRules = "examples/mithril-kitchen-sink/storybook-static => mithril.zip"
vcs {
root(OpenSourceProjects_Storybook.vcsRoots.OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster)
}
steps {
script {
name = "Bootstrap"
scriptContent = """
yarn
yarn bootstrap --core
""".trimIndent()
dockerImage = "node:latest"
}
script {
name = "build"
scriptContent = """
#!/bin/sh
set -e -x
cd examples/mithril-kitchen-sink
yarn build-storybook
""".trimIndent()
dockerImage = "node:latest"
}
}
failureConditions {
failOnMetricChange {
metric = BuildFailureOnMetric.MetricType.ARTIFACT_SIZE
threshold = 50
units = BuildFailureOnMetric.MetricUnit.PERCENTS
comparison = BuildFailureOnMetric.MetricComparison.LESS
compareTo = build {
buildRule = lastSuccessful()
}
}
}
features {
commitStatusPublisher {
publisher = github {
githubUrl = "https://api.github.com"
authType = personalToken {
token = "credentialsJSON:5ffe2d7e-531e-4f6f-b1fc-a41bfea26eaa"
}
}
param("github_oauth_user", "Hypnosphi")
}
}
requirements {
doesNotContain("env.OS", "Windows")
}
})

View File

@ -1,71 +0,0 @@
package OpenSourceProjects_Storybook.buildTypes
import jetbrains.buildServer.configs.kotlin.v2017_2.*
import jetbrains.buildServer.configs.kotlin.v2017_2.buildFeatures.commitStatusPublisher
import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.script
import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.BuildFailureOnMetric
import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.failOnMetricChange
object OpenSourceProjects_Storybook_Polymer : BuildType({
uuid = "8cc5f747-4ca7-4f0d-940d-b0c422f501a6-polymer"
id = "OpenSourceProjects_Storybook_Polymer"
name = "Polymer"
artifactRules = "examples/polymer-cli/storybook-static => polymer.zip"
vcs {
root(OpenSourceProjects_Storybook.vcsRoots.OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster)
}
steps {
script {
name = "Bootstrap"
scriptContent = """
yarn
yarn bootstrap --core
""".trimIndent()
dockerImage = "node:latest"
}
script {
name = "build"
scriptContent = """
#!/bin/sh
set -e -x
cd examples/polymer-cli
yarn build-storybook
""".trimIndent()
dockerImage = "node:latest"
}
}
failureConditions {
failOnMetricChange {
metric = BuildFailureOnMetric.MetricType.ARTIFACT_SIZE
threshold = 50
units = BuildFailureOnMetric.MetricUnit.PERCENTS
comparison = BuildFailureOnMetric.MetricComparison.LESS
compareTo = build {
buildRule = lastSuccessful()
}
}
}
features {
commitStatusPublisher {
publisher = github {
githubUrl = "https://api.github.com"
authType = personalToken {
token = "credentialsJSON:5ffe2d7e-531e-4f6f-b1fc-a41bfea26eaa"
}
}
param("github_oauth_user", "Hypnosphi")
}
}
requirements {
doesNotContain("env.OS", "Windows")
}
})

View File

@ -1,71 +0,0 @@
package OpenSourceProjects_Storybook.buildTypes
import jetbrains.buildServer.configs.kotlin.v2017_2.*
import jetbrains.buildServer.configs.kotlin.v2017_2.buildFeatures.commitStatusPublisher
import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.script
import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.BuildFailureOnMetric
import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.failOnMetricChange
object OpenSourceProjects_Storybook_Vue : BuildType({
uuid = "8cc5f747-4ca7-4f0d-940d-b0c422f501a6-vue"
id = "OpenSourceProjects_Storybook_Vue"
name = "Vue"
artifactRules = "examples/vue-kitchen-sink/storybook-static => vue.zip"
vcs {
root(OpenSourceProjects_Storybook.vcsRoots.OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster)
}
steps {
script {
name = "Bootstrap"
scriptContent = """
yarn
yarn bootstrap --core
""".trimIndent()
dockerImage = "node:latest"
}
script {
name = "build"
scriptContent = """
#!/bin/sh
set -e -x
cd examples/vue-kitchen-sink
yarn build-storybook
""".trimIndent()
dockerImage = "node:latest"
}
}
failureConditions {
failOnMetricChange {
metric = BuildFailureOnMetric.MetricType.ARTIFACT_SIZE
threshold = 50
units = BuildFailureOnMetric.MetricUnit.PERCENTS
comparison = BuildFailureOnMetric.MetricComparison.LESS
compareTo = build {
buildRule = lastSuccessful()
}
}
}
features {
commitStatusPublisher {
publisher = github {
githubUrl = "https://api.github.com"
authType = personalToken {
token = "credentialsJSON:5ffe2d7e-531e-4f6f-b1fc-a41bfea26eaa"
}
}
param("github_oauth_user", "Hypnosphi")
}
}
requirements {
doesNotContain("env.OS", "Windows")
}
})

View File

@ -1,35 +0,0 @@
package OpenSourceProjects_Storybook.patches.projects
import jetbrains.buildServer.configs.kotlin.v2017_2.*
import jetbrains.buildServer.configs.kotlin.v2017_2.Project
import jetbrains.buildServer.configs.kotlin.v2017_2.ui.*
/*
This patch script was generated by TeamCity on settings change in UI.
To apply the patch, change the project with uuid = '69382d9b-7791-418a-9ff6-1c83b86ed6b5' (id = 'OpenSourceProjects_Storybook')
accordingly and delete the patch script.
*/
changeProject("69382d9b-7791-418a-9ff6-1c83b86ed6b5") {
features {
add {
feature {
type = "buildtype-graphs"
id = "PROJECT_EXT_132"
param("series", """
[
{
"type": "valueType",
"title": "Build Duration (all stages)",
"key": "BuildDuration"
}
]
""".trimIndent())
param("format", "duration")
param("hideFilters", "")
param("title", "Build Duration")
param("defaultFilters", "")
param("seriesTitle", "Serie")
}
}
}
}

View File

@ -155,7 +155,7 @@ We welcome contributions to Storybook!
> boolean check if unit tests all pass - uses jest
- `yarn test:watch` - will run tests in watch-mode
- `yarn run test --core --watch` - will run core tests in watch-mode
### Backers