GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-04 23:01:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into fix-deps

Browse Source
This commit is contained in:
igor-dv 2018-11-05 19:35:51 +02:00
commit 46cbd3bce4
13 changed files with 10 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.teamcity/OpenSourceProjects_Storybook/Project.kt vendored
View File

@ -195,6 +195,6 @@ object Project : Project({
}
params {
param("docker.node.version", "latest")
param("docker.node.version", "dubnium")
}
})

1
.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Bootstrap.kt vendored
View File

@ -46,6 +46,7 @@ object OpenSourceProjects_Storybook_Bootstrap : BuildType({
+:pull/*
+:release/*
+:master
+:next
+:snyk-fix-*
""".trimIndent()
enabled = false

1
.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt vendored
View File

@ -33,6 +33,7 @@ object OpenSourceProjects_Storybook_Build_2 : BuildType({
+:pull/*
+:release/*
+:master
+:next
+:snyk-fix-*
""".trimIndent()
}

1
.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_CliTestLatestCra.kt vendored
View File

@ -40,6 +40,7 @@ object OpenSourceProjects_Storybook_CliTestLatestCra : BuildType({
+:pull/*
+:release/*
+:master
+:next
""".trimIndent()
}
retryBuild {}

4
.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Danger.kt vendored
View File

@ -13,8 +13,8 @@ object OpenSourceProjects_Storybook_Danger : BuildType({
name = "Danger"
params {
password("env.DANGER_GITHUB_API_TOKEN", "credentialsJSON:7f0943ab-dfca-49dd-b926-03062007bfd0")
param("env.PULL_REQUEST_URL", "https://github.com/storybooks/storybook/pull/%teamcity.build.branch%")
password("env.DANGER_GITHUB_API_TOKEN", "credentialsJSON:9ac87388-d267-4def-a10e-3e596369f644")
param("env.PULL_REQUEST_URL", "https://github.com/storybooks/storybook/%teamcity.build.branch%")
}
vcs {

1
.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Lint_Warnings.kt vendored
View File

@ -42,6 +42,7 @@ object OpenSourceProjects_Storybook_Lint_Warnings : BuildType({
+:pull/*
+:release/*
+:master
+:next
""".trimIndent()
}
}

26
.teamcity/OpenSourceProjects_Storybook/patches/buildTypes/759f0116-2f7d-4c03-8220-56e4ab03be3a.kts vendored
View File

@ -1,26 +0,0 @@
package OpenSourceProjects_Storybook.patches.buildTypes
import jetbrains.buildServer.configs.kotlin.v2017_2.*
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 buildType with uuid = '759f0116-2f7d-4c03-8220-56e4ab03be3a' (id = 'OpenSourceProjects_Storybook_Danger')
accordingly, and delete the patch script.
*/
changeBuildType("759f0116-2f7d-4c03-8220-56e4ab03be3a") {
params {
expect {
password("env.DANGER_GITHUB_API_TOKEN", "credentialsJSON:7f0943ab-dfca-49dd-b926-03062007bfd0")
}
update {
password("env.DANGER_GITHUB_API_TOKEN", "credentialsJSON:9ac87388-d267-4def-a10e-3e596369f644")
}
expect {
param("env.PULL_REQUEST_URL", "https://github.com/storybooks/storybook/pull/%teamcity.build.branch%")
}
update {
param("env.PULL_REQUEST_URL", "https://github.com/storybooks/storybook/%teamcity.build.branch%")
}
}
}

41
.teamcity/OpenSourceProjects_Storybook/patches/buildTypes/b1db1a3a-a4cf-46ea-8f55-98b86611f92e.kts vendored
View File

@ -1,41 +0,0 @@
package OpenSourceProjects_Storybook.patches.buildTypes
import jetbrains.buildServer.configs.kotlin.v2017_2.*
import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.ScriptBuildStep
import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.script
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 buildType with uuid = 'b1db1a3a-a4cf-46ea-8f55-98b86611f92e' (id = 'OpenSourceProjects_Storybook_CliTest')
accordingly, and delete the patch script.
*/
changeBuildType("b1db1a3a-a4cf-46ea-8f55-98b86611f92e") {
expectSteps {
script {
name = "Test"
scriptContent = """
#!/bin/sh
set -e -x
yarn
yarn test --cli --teamcity
""".trimIndent()
dockerImage = "node:%docker.node.version%"
}
}
steps {
update<ScriptBuildStep>(0) {
scriptContent = """
#!/bin/sh
set -e -x
yarn
rm -rf addons/actions/node_modules/@storybook
yarn test --cli --teamcity
""".trimIndent()
}
}
}

21
.teamcity/OpenSourceProjects_Storybook/patches/projects/69382d9b-7791-418a-9ff6-1c83b86ed6b5.kts vendored
View File

@ -1,21 +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") {
params {
expect {
param("docker.node.version", "latest")
}
update {
param("docker.node.version", "dubnium")
}
}
}

1
.teamcity/OpenSourceProjects_Storybook/vcsRoots/OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster.kt vendored
View File

@ -8,6 +8,7 @@ object OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMa
id = "OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster"
name = "https://github.com/storybooks/storybook#refs/heads/master"
url = "git@github.com:storybooks/storybook.git"
branch = "refs/heads/next"
branchSpec = """
+:refs/(pull/*)/head
+:refs/heads/*

1
.teamcity/OpenSourceProjects_Storybook/vcsRoots/OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster1.kt vendored
View File

@ -8,6 +8,7 @@ object OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMa
id = "OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster1"
name = "https://github.com/storybooks/storybook#refs/heads/master (1)"
url = "git@github.com:storybooks/storybook.git"
branch = "refs/heads/next"
authMethod = uploadedKey {
userName = "git"
uploadedKey = "Storybook bot"

16
.teamcity/OpenSourceProjects_Storybook/vcsRoots/OpenSourceProjects_Storybook_SBNext.kt vendored
View File

@ -1,16 +0,0 @@
package OpenSourceProjects_Storybook.vcsRoots
import jetbrains.buildServer.configs.kotlin.v2017_2.*
import jetbrains.buildServer.configs.kotlin.v2017_2.vcs.GitVcsRoot
object OpenSourceProjects_Storybook_SBNext : GitVcsRoot({
uuid = "f0bd8d49-0f6a-4859-9d26-d066af4b5d6d"
id = "OpenSourceProjects_Storybook_SBNext"
name = "SBNext"
url = "git@github.com:storybooks/SBNext.git"
branch = "refs/heads/POC-bundler"
authMethod = uploadedKey {
userName = "git"
uploadedKey = "Storybook bot"
}
})

2
dangerfile.js
View File

@ -10,7 +10,7 @@ const Versions = {
MAJOR: 'MAJOR',
};
const branchVersion = Versions.PATCH;
const branchVersion = Versions.MINOR;
const checkRequiredLabels = labels => {
const forbiddenLabels = flatten([