Skip to content

Commit 8f4471e

Browse files
author
Evans Aboge (from Dev Box)
committed
Trim version
1 parent d45f711 commit 8f4471e

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

.azure-pipelines/ci-build.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ steps:
4343
4444
- powershell: |
4545
$content = [XML](Get-Content ./Directory.Build.props)
46-
$version = $content.Project.PropertyGroup.Version
47-
Write-Host "Version found: $version"
46+
$version = $content.Project.PropertyGroup.Version.Trim()
47+
Write-Host "Version found: '$version'"
4848
# Set as both an output variable and a regular variable
4949
Write-Host "##vso[task.setvariable variable=version;isoutput=true]$version"
5050
Write-Host "##vso[task.setvariable variable=VERSION]$version"
@@ -53,8 +53,12 @@ steps:
5353
5454
- bash: |
5555
# Debug output to verify version variable
56-
echo "Version from previous step: $VERSION"
57-
displayName: 'Verify version variable'
56+
echo "Version from previous step: '$VERSION'"
57+
# Trim any whitespace that might exist
58+
VERSION=$(echo "$VERSION" | xargs)
59+
echo "Version after trimming: '$VERSION'"
60+
echo "##vso[task.setvariable variable=VERSION]$VERSION"
61+
displayName: 'Verify and clean version variable'
5862
5963
- bash: |
6064
runnumber=$(echo $(Build.BuildNumber) | awk '{ print substr($0, length($0)-3, length($0)) }')
@@ -72,27 +76,27 @@ steps:
7276
echo "Building Docker image..."
7377
# Using quotes around tags to prevent flag interpretation
7478
docker build \
75-
--build-arg "version_suffix=preview.${BUILDDATE}${RUNNUMBER}" \
76-
-t "$(REGISTRY)/$(IMAGE_NAME):nightly" \
77-
-t "$(REGISTRY)/$(IMAGE_NAME):${VERSION}" \
79+
--build-arg version_suffix="preview.${BUILDDATE}${RUNNUMBER}" \
80+
-t "${REGISTRY}/${IMAGE_NAME}:nightly" \
81+
-t "${REGISTRY}/${IMAGE_NAME}:${VERSION}" \
7882
"$(Build.SourcesDirectory)"
7983
8084
echo "Pushing Docker image with nightly tag..."
81-
docker push "$(REGISTRY)/$(IMAGE_NAME):nightly"
82-
docker push "$(REGISTRY)/$(IMAGE_NAME):${VERSION}"
85+
docker push "${REGISTRY}/${IMAGE_NAME}:nightly"
86+
docker push "${REGISTRY}/${IMAGE_NAME}:${VERSION}"
8387
displayName: 'Build and Push Nightly Image'
8488
condition: eq(variables['Build.SourceBranch'], variables['PREVIEW_BRANCH'])
8589
8690
- bash: |
8791
echo "Building Docker image for release..."
8892
docker build \
89-
-t "$(REGISTRY)/$(IMAGE_NAME):latest" \
90-
-t "$(REGISTRY)/$(IMAGE_NAME):${VERSION}" \
93+
-t "${REGISTRY}/${IMAGE_NAME}:latest" \
94+
-t "${REGISTRY}/${IMAGE_NAME}:${VERSION}" \
9195
"$(Build.SourcesDirectory)"
9296
9397
echo "Pushing Docker image with latest and version tags..."
94-
docker push "$(REGISTRY)/$(IMAGE_NAME):latest"
95-
docker push "$(REGISTRY)/$(IMAGE_NAME):${VERSION}"
98+
docker push "${REGISTRY}/${IMAGE_NAME}:latest"
99+
docker push "${REGISTRY}/${IMAGE_NAME}:${VERSION}"
96100
displayName: 'Build and Push Release Image'
97101
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
98102

0 commit comments

Comments
 (0)