diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 80d750859f..c49b0dbf80 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -48,6 +48,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} variables: + DOTNET_NOLOGO: true ${{ if ne(parameters.buildAgent.variables, '') }}: ${{ parameters.buildAgent.variables }} ${{ if ne(length(parameters.variables), 0) }}: @@ -318,17 +319,13 @@ jobs: # actual build - ${{ if ne(parameters.skipSteps, 'true') }}: - ${{ if eq(parameters.docker, '') }}: + - pwsh: dotnet --info + displayName: Display all the .NET information + condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) + - pwsh: dotnet tool restore + displayName: Restore the .NET tools + condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) - ${{ if eq(parameters.buildAgent.pool.os, 'windows') }}: - - pwsh: dotnet tool restore - displayName: Restore the .NET tools - condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) - retryCountOnTaskFailure: 1 - timeoutInMinutes: 5 - - pwsh: dotnet cake --info - displayName: Display all the Cake information - condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) - retryCountOnTaskFailure: 1 - timeoutInMinutes: 5 - pwsh: | Get-Content $PSCommandPath ${{ parameters.initScript }} @@ -343,16 +340,6 @@ jobs: retryCountOnTaskFailure: ${{ parameters.retryCount }} condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) - ${{ if ne(parameters.buildAgent.pool.os, 'windows') }}: - - bash: dotnet tool restore - displayName: Restore the .NET tools - condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) - retryCountOnTaskFailure: 1 - timeoutInMinutes: 5 - - bash: dotnet cake --info - displayName: Display all the Cake information - condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) - retryCountOnTaskFailure: 1 - timeoutInMinutes: 5 - bash: | cat ${BASH_SOURCE[0]} ${{ parameters.initScript }} diff --git a/scripts/azure-templates-merger.yml b/scripts/azure-templates-merger.yml index d4fedda119..47b634bcf8 100644 --- a/scripts/azure-templates-merger.yml +++ b/scripts/azure-templates-merger.yml @@ -18,18 +18,18 @@ jobs: skipInstall: true skipSteps: true requiredArtifacts: ${{ parameters.requiredArtifacts }} - preBuildSteps: - - pwsh: az devops configure --defaults organization=$(System.TeamFoundationCollectionUri) project=$(System.TeamProject) --use-git-aliases true - displayName: Configure the az CLI tool - - ${{ each artifact in parameters.matrixArtifacts }}: - - pwsh: | - $json=@' - ${{ artifact.jobs }} - '@ - .\scripts\download-artifact.ps1 ` - -ArtifactsJson $json ` - -BuildId "$(Build.BuildId)" ` - -OutputDirectory "$(Build.SourcesDirectory)/output" - env: - AZURE_DEVOPS_EXT_PAT: $(System.AccessToken) - displayName: Download the pre-built ${{ artifact.name }} artifacts + # preBuildSteps: + # - pwsh: az devops configure --defaults organization=$(System.TeamFoundationCollectionUri) project=$(System.TeamProject) --use-git-aliases true + # displayName: Configure the az CLI tool + # - ${{ each artifact in parameters.matrixArtifacts }}: + # - pwsh: | + # $json=@' + # ${{ artifact.jobs }} + # '@ + # .\scripts\download-artifact.ps1 ` + # -ArtifactsJson $json ` + # -BuildId "$(Build.BuildId)" ` + # -OutputDirectory "$(Build.SourcesDirectory)/output" + # env: + # AZURE_DEVOPS_EXT_PAT: $(System.AccessToken) + # displayName: Download the pre-built ${{ artifact.name }} artifacts diff --git a/scripts/azure-templates-stages.yml b/scripts/azure-templates-stages.yml index f3545df8ab..f0b8e56934 100644 --- a/scripts/azure-templates-stages.yml +++ b/scripts/azure-templates-stages.yml @@ -513,6 +513,32 @@ stages: - name: native_macos_macos # tvOS - name: native_tvos_macos + # Linux + - name: native_linux_arm64_linux + - name: native_linux_arm64_nodeps_linux + - name: native_linux_arm_linux + - name: native_linux_arm_nodeps_linux + - name: native_linux_x64_alpine_linux + - name: native_linux_x64_alpine_nodeps_linux + - name: native_linux_x64_linux + - name: native_linux_x64_nodeps_linux + # WASM + - name: native_wasm_2_0_23_linux + - name: native_wasm_2_0_6_linux + - name: native_wasm_3_1_12_linux + - name: native_wasm_3_1_12_SIMD_linux + - name: native_wasm_3_1_12_Threading_linux + - name: native_wasm_3_1_12_Threading_SIMD_linux + - name: native_wasm_3_1_34_linux + - name: native_wasm_3_1_34_SIMD_linux + - name: native_wasm_3_1_34_SIMD_Threading_linux + - name: native_wasm_3_1_34_Threading_linux + - name: native_wasm_3_1_56_linux + - name: native_wasm_3_1_56_SIMD_linux + - name: native_wasm_3_1_56_SIMD_Threading_linux + - name: native_wasm_3_1_56_Threading_linux + - name: native_wasm_3_1_7_linux + # matix checks matrixArtifacts: - name: native_linux jobs: $(nativeLinuxJobs) @@ -525,6 +551,33 @@ stages: sdl: ${{ parameters.sdl }} buildPipelineType: ${{ parameters.buildPipelineType }} buildAgent: ${{ parameters.buildAgentHost }} + requiredArtifacts: + # Linux + - name: native_linux_arm64_linux + - name: native_linux_arm64_nodeps_linux + - name: native_linux_arm_linux + - name: native_linux_arm_nodeps_linux + - name: native_linux_x64_alpine_linux + - name: native_linux_x64_alpine_nodeps_linux + - name: native_linux_x64_linux + - name: native_linux_x64_nodeps_linux + # WASM + - name: native_wasm_2_0_23_linux + - name: native_wasm_2_0_6_linux + - name: native_wasm_3_1_12_linux + - name: native_wasm_3_1_12_SIMD_linux + - name: native_wasm_3_1_12_Threading_linux + - name: native_wasm_3_1_12_Threading_SIMD_linux + - name: native_wasm_3_1_34_linux + - name: native_wasm_3_1_34_SIMD_linux + - name: native_wasm_3_1_34_SIMD_Threading_linux + - name: native_wasm_3_1_34_Threading_linux + - name: native_wasm_3_1_56_linux + - name: native_wasm_3_1_56_SIMD_linux + - name: native_wasm_3_1_56_SIMD_Threading_linux + - name: native_wasm_3_1_56_Threading_linux + - name: native_wasm_3_1_7_linux + # matix checks matrixArtifacts: - name: native_wasm jobs: $(nativeWasmJobs) diff --git a/scripts/download-artifact.ps1 b/scripts/download-artifact.ps1 index 4a297d5c25..3c16d95a65 100644 --- a/scripts/download-artifact.ps1 +++ b/scripts/download-artifact.ps1 @@ -29,7 +29,7 @@ Write-Host "Downloading artifacts..." New-Item "$OutputDirectory" -Type Directory -Force | Out-Null foreach ($name in $actualNames) { Write-Host "Downloading '$name'..." - az pipelines runs artifact download --artifact-name "$name" --path "$OutputDirectory" --run-id "$BuildId" --verbose + az pipelines runs artifact download --artifact-name "$name" --path "$OutputDirectory" --run-id "$BuildId" --debug } Write-Host "Downloads complete."