Skip to content

Commit 0281664

Browse files
mattleibowmattleibow
authored
Manually list all the artifacts to download (#3161)
1 parent 1766843 commit 0281664

File tree

4 files changed

+76
-36
lines changed

4 files changed

+76
-36
lines changed

‎scripts/azure-templates-bootstrapper.yml‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
condition: ${{ parameters.condition }}
4949
continueOnError: ${{ parameters.continueOnError }}
5050
variables:
51+
DOTNET_NOLOGO: true
5152
${{ if ne(parameters.buildAgent.variables, '') }}:
5253
${{ parameters.buildAgent.variables }}
5354
${{ if ne(length(parameters.variables), 0) }}:
@@ -318,17 +319,13 @@ jobs:
318319
# actual build
319320
- ${{ if ne(parameters.skipSteps, 'true') }}:
320321
- ${{ if eq(parameters.docker, '') }}:
322+
- pwsh: dotnet --info
323+
displayName: Display all the .NET information
324+
condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
325+
- pwsh: dotnet tool restore
326+
displayName: Restore the .NET tools
327+
condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
321328
- ${{ if eq(parameters.buildAgent.pool.os, 'windows') }}:
322-
- pwsh: dotnet tool restore
323-
displayName: Restore the .NET tools
324-
condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
325-
retryCountOnTaskFailure: 1
326-
timeoutInMinutes: 5
327-
- pwsh: dotnet cake --info
328-
displayName: Display all the Cake information
329-
condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
330-
retryCountOnTaskFailure: 1
331-
timeoutInMinutes: 5
332329
- pwsh: |
333330
Get-Content $PSCommandPath
334331
${{ parameters.initScript }}
@@ -343,16 +340,6 @@ jobs:
343340
retryCountOnTaskFailure: ${{ parameters.retryCount }}
344341
condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
345342
- ${{ if ne(parameters.buildAgent.pool.os, 'windows') }}:
346-
- bash: dotnet tool restore
347-
displayName: Restore the .NET tools
348-
condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
349-
retryCountOnTaskFailure: 1
350-
timeoutInMinutes: 5
351-
- bash: dotnet cake --info
352-
displayName: Display all the Cake information
353-
condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
354-
retryCountOnTaskFailure: 1
355-
timeoutInMinutes: 5
356343
- bash: |
357344
cat ${BASH_SOURCE[0]}
358345
${{ parameters.initScript }}

‎scripts/azure-templates-merger.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ jobs:
1818
skipInstall: true
1919
skipSteps: true
2020
requiredArtifacts: ${{ parameters.requiredArtifacts }}
21-
preBuildSteps:
22-
- pwsh: az devops configure --defaults organization=$(System.TeamFoundationCollectionUri) project=$(System.TeamProject) --use-git-aliases true
23-
displayName: Configure the az CLI tool
24-
- ${{ each artifact in parameters.matrixArtifacts }}:
25-
- pwsh: |
26-
$json=@'
27-
${{ artifact.jobs }}
28-
'@
29-
.\scripts\download-artifact.ps1 `
30-
-ArtifactsJson $json `
31-
-BuildId "$(Build.BuildId)" `
32-
-OutputDirectory "$(Build.SourcesDirectory)/output"
33-
env:
34-
AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
35-
displayName: Download the pre-built ${{ artifact.name }} artifacts
21+
# preBuildSteps:
22+
# - pwsh: az devops configure --defaults organization=$(System.TeamFoundationCollectionUri) project=$(System.TeamProject) --use-git-aliases true
23+
# displayName: Configure the az CLI tool
24+
# - ${{ each artifact in parameters.matrixArtifacts }}:
25+
# - pwsh: |
26+
# $json=@'
27+
# ${{ artifact.jobs }}
28+
# '@
29+
# .\scripts\download-artifact.ps1 `
30+
# -ArtifactsJson $json `
31+
# -BuildId "$(Build.BuildId)" `
32+
# -OutputDirectory "$(Build.SourcesDirectory)/output"
33+
# env:
34+
# AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
35+
# displayName: Download the pre-built ${{ artifact.name }} artifacts

‎scripts/azure-templates-stages.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,32 @@ stages:
513513
- name: native_macos_macos
514514
# tvOS
515515
- name: native_tvos_macos
516+
# Linux
517+
- name: native_linux_arm64_linux
518+
- name: native_linux_arm64_nodeps_linux
519+
- name: native_linux_arm_linux
520+
- name: native_linux_arm_nodeps_linux
521+
- name: native_linux_x64_alpine_linux
522+
- name: native_linux_x64_alpine_nodeps_linux
523+
- name: native_linux_x64_linux
524+
- name: native_linux_x64_nodeps_linux
525+
# WASM
526+
- name: native_wasm_2_0_23_linux
527+
- name: native_wasm_2_0_6_linux
528+
- name: native_wasm_3_1_12_linux
529+
- name: native_wasm_3_1_12_SIMD_linux
530+
- name: native_wasm_3_1_12_Threading_linux
531+
- name: native_wasm_3_1_12_Threading_SIMD_linux
532+
- name: native_wasm_3_1_34_linux
533+
- name: native_wasm_3_1_34_SIMD_linux
534+
- name: native_wasm_3_1_34_SIMD_Threading_linux
535+
- name: native_wasm_3_1_34_Threading_linux
536+
- name: native_wasm_3_1_56_linux
537+
- name: native_wasm_3_1_56_SIMD_linux
538+
- name: native_wasm_3_1_56_SIMD_Threading_linux
539+
- name: native_wasm_3_1_56_Threading_linux
540+
- name: native_wasm_3_1_7_linux
541+
# matix checks
516542
matrixArtifacts:
517543
- name: native_linux
518544
jobs: $(nativeLinuxJobs)
@@ -525,6 +551,33 @@ stages:
525551
sdl: ${{ parameters.sdl }}
526552
buildPipelineType: ${{ parameters.buildPipelineType }}
527553
buildAgent: ${{ parameters.buildAgentHost }}
554+
requiredArtifacts:
555+
# Linux
556+
- name: native_linux_arm64_linux
557+
- name: native_linux_arm64_nodeps_linux
558+
- name: native_linux_arm_linux
559+
- name: native_linux_arm_nodeps_linux
560+
- name: native_linux_x64_alpine_linux
561+
- name: native_linux_x64_alpine_nodeps_linux
562+
- name: native_linux_x64_linux
563+
- name: native_linux_x64_nodeps_linux
564+
# WASM
565+
- name: native_wasm_2_0_23_linux
566+
- name: native_wasm_2_0_6_linux
567+
- name: native_wasm_3_1_12_linux
568+
- name: native_wasm_3_1_12_SIMD_linux
569+
- name: native_wasm_3_1_12_Threading_linux
570+
- name: native_wasm_3_1_12_Threading_SIMD_linux
571+
- name: native_wasm_3_1_34_linux
572+
- name: native_wasm_3_1_34_SIMD_linux
573+
- name: native_wasm_3_1_34_SIMD_Threading_linux
574+
- name: native_wasm_3_1_34_Threading_linux
575+
- name: native_wasm_3_1_56_linux
576+
- name: native_wasm_3_1_56_SIMD_linux
577+
- name: native_wasm_3_1_56_SIMD_Threading_linux
578+
- name: native_wasm_3_1_56_Threading_linux
579+
- name: native_wasm_3_1_7_linux
580+
# matix checks
528581
matrixArtifacts:
529582
- name: native_wasm
530583
jobs: $(nativeWasmJobs)

‎scripts/download-artifact.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Write-Host "Downloading artifacts..."
2929
New-Item "$OutputDirectory" -Type Directory -Force | Out-Null
3030
foreach ($name in $actualNames) {
3131
Write-Host "Downloading '$name'..."
32-
az pipelines runs artifact download --artifact-name "$name" --path "$OutputDirectory" --run-id "$BuildId" --verbose
32+
az pipelines runs artifact download --artifact-name "$name" --path "$OutputDirectory" --run-id "$BuildId" --debug
3333
}
3434
Write-Host "Downloads complete."
3535

0 commit comments

Comments
 (0)