Skip to content

Commit

Permalink
Merge branch 'try/wpcom-nux-track-open-slide' into add/track-editing-…
Browse files Browse the repository at this point in the history
…toolkit-nux-modal
  • Loading branch information
autumnfjeld committed Oct 30, 2020
2 parents 3f2d978 + bba8f94 commit 75a160f
Show file tree
Hide file tree
Showing 580 changed files with 153,231 additions and 189,792 deletions.
56 changes: 54 additions & 2 deletions .teamcity/settings.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.pullRequests
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.ScriptBuildStep
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.dockerRegistry
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.DockerCommandStep
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.dockerCommand
import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.githubConnection
import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
Expand Down Expand Up @@ -44,6 +46,7 @@ project {
buildType(RunAllUnitTests)
buildType(BuildBaseImages)
buildType(CheckCodeStyle)
buildType(BuildDockerImage)

params {
param("env.NODE_OPTIONS", "--max-old-space-size=32000")
Expand Down Expand Up @@ -83,7 +86,6 @@ object BuildBaseImages : BuildType({

vcs {
root(WpCalypso)

cleanCheckout = true
}

Expand Down Expand Up @@ -138,6 +140,56 @@ object BuildBaseImages : BuildType({
}
})

object BuildDockerImage : BuildType({
name = "Build docker image"
description = "Build docker image for Calypso"

vcs {
root(WpCalypso)
cleanCheckout = true
}

steps {
dockerCommand {
name = "Build docker image"
commandType = build {
source = file {
path = "Dockerfile"
}
namesAndTags = """
registry.a8c.com/calypso/app:build-%build.number%
registry.a8c.com/calypso/app:commit-${WpCalypso.paramRefs.buildVcsNumber}
""".trimIndent()
commandArgs = "--pull --build-arg use_cache=true"
}
param("dockerImage.platform", "linux")
}
dockerCommand {
commandType = push {
namesAndTags = """
registry.a8c.com/calypso/app:build-%build.number%
registry.a8c.com/calypso/app:commit-${WpCalypso.paramRefs.buildVcsNumber}
""".trimIndent()
}
}
}

features {
perfmon {
}
pullRequests {
vcsRootExtId = "${WpCalypso.id}"
provider = github {
authType = token {
token = "credentialsJSON:57e22787-e451-48ed-9fea-b9bf30775b36"
}
filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
}
}
}
})


object RunAllUnitTests : BuildType({
name = "Run unit tests"
description = "Run unit tests"
Expand Down Expand Up @@ -474,7 +526,7 @@ object CheckCodeStyle : BuildType({
nvm install
# Find files to lint
if [ "%teamcity.build.branch.is_default%" = "true" ]; then
if [ "%teamcity.build.branch.is_default%" = "true" ] || [ "%calypso.run_full_eslint%" = "true" ]; then
FILES_TO_LINT="."
else
FILES_TO_LINT=${'$'}(git diff --name-only --diff-filter=d refs/remotes/origin/master...HEAD | grep -E '(\.[jt]sx?|\.md)${'$'}' || exit 0)
Expand Down
Loading

0 comments on commit 75a160f

Please sign in to comment.