Skip to content

Commit 38dc937

Browse files
author
Evans Aboge (from Dev Box)
committed
Fix variable ref
1 parent e4a5b87 commit 38dc937

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

.azure-pipelines/ci-build.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,51 +45,54 @@ steps:
4545
$content = [XML](Get-Content ./Directory.Build.props)
4646
$version = $content.Project.PropertyGroup.Version
4747
Write-Host "Version found: $version"
48+
# Set as both an output variable and a regular variable
4849
Write-Host "##vso[task.setvariable variable=version;isoutput=true]$version"
50+
Write-Host "##vso[task.setvariable variable=VERSION]$version"
4951
displayName: 'Get version from csproj'
5052
name: getversion
5153
5254
- bash: |
5355
# Debug output to verify version variable
54-
echo "Version from previous step: $(getversion.version)"
56+
echo "Version from previous step: $VERSION"
5557
displayName: 'Verify version variable'
5658
5759
- bash: |
5860
runnumber=$(echo $(Build.BuildNumber) | awk '{ print substr($0, length($0)-3, length($0)) }')
59-
echo "##vso[task.setvariable variable=runnumber]$runnumber"
61+
echo "##vso[task.setvariable variable=RUNNUMBER]$runnumber"
6062
displayName: 'Get truncated run number'
6163
condition: eq(variables['Build.SourceBranch'], variables['PREVIEW_BRANCH'])
6264
6365
- bash: |
6466
date=$(date +'%Y%m%d')
65-
echo "##vso[task.setvariable variable=date]$date"
67+
echo "##vso[task.setvariable variable=BUILDDATE]$date"
6668
displayName: 'Get current date'
6769
condition: eq(variables['Build.SourceBranch'], variables['PREVIEW_BRANCH'])
6870
6971
- bash: |
7072
echo "Building Docker image..."
73+
# Using regular pipeline variables instead of output variables
7174
docker build \
72-
--build-arg version_suffix=preview.$(date)$(runnumber) \
75+
--build-arg version_suffix=preview.${BUILDDATE}${RUNNUMBER} \
7376
-t $(REGISTRY)/$(IMAGE_NAME):nightly \
74-
-t $(REGISTRY)/$(IMAGE_NAME):$(getversion.version)-preview.$(date)$(runnumber) \
77+
-t $(REGISTRY)/$(IMAGE_NAME):${VERSION}-preview.${BUILDDATE}${RUNNUMBER} \
7578
"$(Build.SourcesDirectory)"
7679
7780
echo "Pushing Docker image with nightly tag..."
7881
docker push $(REGISTRY)/$(IMAGE_NAME):nightly
79-
docker push $(REGISTRY)/$(IMAGE_NAME):$(getversion.version)-preview.$(date)$(runnumber)
82+
docker push $(REGISTRY)/$(IMAGE_NAME):${VERSION}-preview.${BUILDDATE}${RUNNUMBER}
8083
displayName: 'Build and Push Nightly Image'
8184
condition: eq(variables['Build.SourceBranch'], variables['PREVIEW_BRANCH'])
8285
8386
- bash: |
8487
echo "Building Docker image for release..."
8588
docker build \
8689
-t $(REGISTRY)/$(IMAGE_NAME):latest \
87-
-t $(REGISTRY)/$(IMAGE_NAME):$(getversion.version) \
90+
-t $(REGISTRY)/$(IMAGE_NAME):${VERSION} \
8891
"$(Build.SourcesDirectory)"
8992
9093
echo "Pushing Docker image with latest and version tags..."
9194
docker push $(REGISTRY)/$(IMAGE_NAME):latest
92-
docker push $(REGISTRY)/$(IMAGE_NAME):$(getversion.version)
95+
docker push $(REGISTRY)/$(IMAGE_NAME):${VERSION}
9396
displayName: 'Build and Push Release Image'
9497
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
9598

0 commit comments

Comments
 (0)