Skip to content

Buildkite: simply removing extra spaces #17480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: compatible
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions buildkite/src/Command/DockerImage.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,24 @@ let ReleaseSpec =

let stepKey =
\(spec : ReleaseSpec.Type)
-> "${Artifacts.lowerName
spec.service}${Profiles.toLabelSegment
spec.deb_profile}${BuildFlags.toLabelSegment
spec.build_flags}${spec.step_key_suffix}"
-> "${Artifacts.lowerName spec.service} " ++
"${Profiles.toLabelSegment spec.deb_profile} " ++
"${BuildFlags.toLabelSegment spec.build_flags} " ++
"${spec.step_key_suffix}"

let stepLabel =
\(spec : ReleaseSpec.Type)
-> "Docker: ${Artifacts.capitalName
spec.service} ${Network.capitalName
spec.network} ${DebianVersions.capitalName
spec.deb_codename} ${Profiles.toSuffixUppercase
spec.deb_profile} ${BuildFlags.toSuffixUppercase
spec.build_flags}"
-> "Docker: " ++
"${Artifacts.capitalName spec.service} " ++
"${Network.capitalName spec.network} " ++
"${DebianVersions.capitalName spec.deb_codename} " ++
"${Profiles.toSuffixUppercase spec.deb_profile} " ++
"${BuildFlags.toSuffixUppercase spec.build_flags}"

let generateStep =
\(spec : ReleaseSpec.Type)
-> let exportMinaDebCmd =
"export MINA_DEB_CODENAME=${DebianVersions.lowerName
spec.deb_codename}"
"export MINA_DEB_CODENAME=${DebianVersions.lowerName spec.deb_codename}"

let maybeCacheOption = if spec.no_cache then "--no-cache" else ""

Expand All @@ -115,14 +114,12 @@ let generateStep =
++ " --version ${spec.version}"
++ " --branch ${spec.branch}"
++ " ${maybeCacheOption} "
++ " --deb-codename ${DebianVersions.lowerName
spec.deb_codename}"
++ " --deb-codename ${DebianVersions.lowerName spec.deb_codename}"
++ " --deb-repo ${DebianRepo.address spec.deb_repo}"
++ " --deb-release ${spec.deb_release}"
++ " --deb-version ${spec.deb_version}"
++ " --deb-profile ${Profiles.lowerName spec.deb_profile}"
++ " --deb-build-flags ${BuildFlags.lowerName
spec.build_flags}"
++ " --deb-build-flags ${BuildFlags.lowerName spec.build_flags}"
++ " --deb-legacy-version ${spec.deb_legacy_version}"
++ " --repo ${spec.repo}"

Expand Down