Skip to content

Commit e963a76

Browse files
authored
Fix testing for vs in consolidation pipeline (#4541)
1 parent 4e7a25a commit e963a76

File tree

2 files changed

+37
-35
lines changed

2 files changed

+37
-35
lines changed

eng/ci/templates/official/jobs/host-build-pack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
displayName: Copy files (linux-x64)
150150
inputs:
151151
SourceFolder: $(Build.SourcesDirectory)/pkg_output/linux/linux-x64
152-
# Publish output will include many other files. We only need func & nethost.dll
152+
# Publish output will include many other files. We only need func & libnethost.so
153153
Contents: |
154154
func
155155
libnethost.so

eng/ci/templates/official/jobs/test-consolidated-cli-artifacts.yml

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -68,40 +68,42 @@ jobs:
6868
filePath: '$(Build.SourcesDirectory)/eng/scripts/artifact-assembler/test-artifacts.ps1'
6969
arguments: '-FuncCliPath "$(Pipeline.Workspace)/staging/func-cli"'
7070

71-
- task: PowerShell@2
72-
displayName: 'Check if visualstudio artifact exists'
73-
inputs:
74-
targetType: 'inline'
75-
pwsh: true
76-
script: |
77-
$path = "$(Pipeline.Workspace)/func-cli-${{ parameters.arch }}/func-cli-visualstudio"
78-
if (Test-Path $path) {
79-
Write-Host "Visual Studio CLI artifacts found at $path"
80-
Write-Host "##vso[task.setvariable variable=vsCliExists]true"
81-
} else {
82-
Write-Host "Visual Studio CLI artifacts not found at $path"
83-
Write-Host "##vso[task.setvariable variable=vsCliExists]false"
84-
}
85-
86-
- task: ExtractFiles@1
87-
condition: eq( variables['vsCliExists'], 'true' )
88-
inputs:
89-
archiveFilePatterns: '$(Pipeline.Workspace)/func-cli-${{ parameters.arch }}/func-cli-visualstudio/*.zip'
90-
destinationFolder: '$(Pipeline.Workspace)/staging/func-cli-visualstudio'
91-
cleanDestinationFolder: true
92-
overwriteExistingFiles: true
71+
# The visual studio tests are checking for the Core Tools Host - we only build the host for linux and windows.
72+
- ${{ if or(eq(parameters.arch, 'linux-x64'), contains(parameters.arch, 'win')) }}:
73+
- task: PowerShell@2
74+
displayName: 'Check if visualstudio artifact exists'
75+
inputs:
76+
targetType: 'inline'
77+
pwsh: true
78+
script: |
79+
$path = "$(Pipeline.Workspace)/func-cli-${{ parameters.arch }}/func-cli-visualstudio"
80+
if (Test-Path $path) {
81+
Write-Host "Visual Studio CLI artifacts found at $path"
82+
Write-Host "##vso[task.setvariable variable=vsCliExists]true"
83+
} else {
84+
Write-Host "Visual Studio CLI artifacts not found at $path"
85+
Write-Host "##vso[task.setvariable variable=vsCliExists]false"
86+
}
9387
94-
- ${{ if not(contains(parameters.arch, 'win')) }}:
95-
- bash: |
96-
chmod +x $(Pipeline.Workspace)/staging/func-cli-visualstudio/func
97-
chmod +x $(Pipeline.Workspace)/staging/func-cli-visualstudio/gozip
98-
displayName: 'Make CLI binaries executable'
88+
- task: ExtractFiles@1
89+
displayName: 'Unzip func-cli-visualstudio'
9990
condition: eq( variables['vsCliExists'], 'true' )
91+
inputs:
92+
archiveFilePatterns: '$(Pipeline.Workspace)/func-cli-${{ parameters.arch }}/func-cli-visualstudio/*.zip'
93+
destinationFolder: '$(Pipeline.Workspace)/staging/func-cli-visualstudio'
94+
cleanDestinationFolder: true
95+
overwriteExistingFiles: true
10096

101-
- task: PowerShell@2
102-
displayName: 'Test Artifacts - Visual Studio'
103-
condition: eq( variables['vsCliExists'], 'true' )
104-
inputs:
105-
targetType: filePath
106-
filePath: '$(Build.SourcesDirectory)/eng/scripts/artifact-assembler/test-vs-artifacts.ps1'
107-
arguments: '-FuncCliPath "$(Pipeline.Workspace)/staging/func-cli-visualstudio"'
97+
- ${{ if not(contains(parameters.arch, 'win')) }}:
98+
- bash: |
99+
chmod +x $(Pipeline.Workspace)/staging/func-cli-visualstudio/func
100+
displayName: 'Make CLI binaries executable'
101+
condition: eq( variables['vsCliExists'], 'true' )
102+
103+
- task: PowerShell@2
104+
displayName: 'Test Artifacts - Visual Studio'
105+
condition: eq( variables['vsCliExists'], 'true' )
106+
inputs:
107+
targetType: filePath
108+
filePath: '$(Build.SourcesDirectory)/eng/scripts/artifact-assembler/test-vs-artifacts.ps1'
109+
arguments: '-FuncCliPath "$(Pipeline.Workspace)/staging/func-cli-visualstudio"'

0 commit comments

Comments
 (0)