From 0e3d1fdaac7b0b8f7714e9cf2327f29285130840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Tue, 4 Apr 2023 16:43:30 +0200 Subject: [PATCH 1/6] Don't push logs from Publish, we have none. --- azure-pipelines.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d090c259b0..4275905795 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -93,6 +93,10 @@ stages: testResultsFormat: 'vstest' enableTelemetry: true enableSourceBuild: true + artifacts: + publish: + # We have no logs to publish. Disable uploading: https://github.com/dotnet/arcade/blob/main/Documentation/AzureDevOps/TemplateSchema.md#artifact-example + logs: false jobs: - job: Windows timeoutInMinutes: 120 From dedb263afd481976d26b2bca41247a39c3cfd813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Wed, 5 Apr 2023 10:55:52 +0200 Subject: [PATCH 2/6] Fix publish warning --- azure-pipelines.yml | 65 +++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 37 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4275905795..0d5d7f8b78 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -93,10 +93,6 @@ stages: testResultsFormat: 'vstest' enableTelemetry: true enableSourceBuild: true - artifacts: - publish: - # We have no logs to publish. Disable uploading: https://github.com/dotnet/arcade/blob/main/Documentation/AzureDevOps/TemplateSchema.md#artifact-example - logs: false jobs: - job: Windows timeoutInMinutes: 120 @@ -225,39 +221,34 @@ stages: ArtifactName: TestResults condition: failed() - - job: Publish - dependsOn: OtherOSes - pool: - ${{ if eq(variables._RunAsPublic, True) }}: - name: NetCore-Public - demands: ImageOverride -equals windows.vs2022.amd64.open - ${{ if eq(variables._RunAsInternal, True) }}: - name: NetCore1ESPool-Internal - demands: ImageOverride -equals 1es-windows-2022 - strategy: - matrix: - Release: - _BuildConfig: Release - # ${{ if eq(variables._RunAsPublic, True) }}: - # Debug: - # _BuildConfig: Debug - steps: - # Download the built packages into local package source, as if we built them on this machine. - - task: DownloadPipelineArtifact@2 - displayName: Download Package Artifacts - inputs: - artifactName: PackageArtifacts - targetPath: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping' - - - task: DownloadPipelineArtifact@2 - displayName: Download VSSetup Artifacts - inputs: - artifactName: VSSetupArtifacts - targetPath: '$(Build.SourcesDirectory)/artifacts/VSSetup/$(_BuildConfig)' - - # TODO: Publishing to the feeds is making non-arcade CI acceptance tests fail so we disable these steps for now. - # They will need to be re-enabled once this is merged to main. - - ${{ if eq(variables._RunAsInternal, True) }}: + - ${{ if eq(variables._RunAsInternal, True) }}: + - job: Publish + dependsOn: OtherOSes + pool: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals 1es-windows-2022 + strategy: + matrix: + Release: + _BuildConfig: Release + steps: + # The template job needs a log, otherwise it writes a warning. We can disable log uploading only for + # the whole stage, which is not what we want to do. So we write an empty file instead. + - pwsh: '"" | Set-Content "$(Build.SourcesDirectory)/artifacts/logs/$(_BuildConfig)/empty.log"' + name: Add empty log file + # Download the built packages into local package source, as if we built them on this machine. + - task: DownloadPipelineArtifact@2 + displayName: Download Package Artifacts + inputs: + artifactName: PackageArtifacts + targetPath: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping' + + - task: DownloadPipelineArtifact@2 + displayName: Download VSSetup Artifacts + inputs: + artifactName: VSSetupArtifacts + targetPath: '$(Build.SourcesDirectory)/artifacts/VSSetup/$(_BuildConfig)' + - task: NuGetAuthenticate@0 displayName: 'NuGet Authenticate to dotnet-tools and test-tools feeds' From 978be3a593d8ac02970f7c7c90f27575814f074a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Wed, 5 Apr 2023 10:58:00 +0200 Subject: [PATCH 3/6] Name is string --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0d5d7f8b78..9e25b9d29b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -235,7 +235,7 @@ stages: # The template job needs a log, otherwise it writes a warning. We can disable log uploading only for # the whole stage, which is not what we want to do. So we write an empty file instead. - pwsh: '"" | Set-Content "$(Build.SourcesDirectory)/artifacts/logs/$(_BuildConfig)/empty.log"' - name: Add empty log file + name: 'Add empty log file' # Download the built packages into local package source, as if we built them on this machine. - task: DownloadPipelineArtifact@2 displayName: Download Package Artifacts From ffd5f65e7fd25409353af05391be3c303418104c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Wed, 5 Apr 2023 10:59:18 +0200 Subject: [PATCH 4/6] underscores --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9e25b9d29b..509ce08311 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -235,7 +235,7 @@ stages: # The template job needs a log, otherwise it writes a warning. We can disable log uploading only for # the whole stage, which is not what we want to do. So we write an empty file instead. - pwsh: '"" | Set-Content "$(Build.SourcesDirectory)/artifacts/logs/$(_BuildConfig)/empty.log"' - name: 'Add empty log file' + name: 'Add_empty_logfile' # Download the built packages into local package source, as if we built them on this machine. - task: DownloadPipelineArtifact@2 displayName: Download Package Artifacts From 00fcc72126120e1311ebcf98052942e3b31fbd1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Wed, 5 Apr 2023 13:11:35 +0200 Subject: [PATCH 5/6] New file --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 509ce08311..0c1695d77a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -234,7 +234,7 @@ stages: steps: # The template job needs a log, otherwise it writes a warning. We can disable log uploading only for # the whole stage, which is not what we want to do. So we write an empty file instead. - - pwsh: '"" | Set-Content "$(Build.SourcesDirectory)/artifacts/logs/$(_BuildConfig)/empty.log"' + - pwsh: 'New-Item -Type file -Force "$(Build.SourcesDirectory)/artifacts/logs/$(_BuildConfig)/empty.log"' name: 'Add_empty_logfile' # Download the built packages into local package source, as if we built them on this machine. - task: DownloadPipelineArtifact@2 From 1fc9028b26a631be73737eb205aa7496a89fb8c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Wed, 5 Apr 2023 15:05:32 +0200 Subject: [PATCH 6/6] no s --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0c1695d77a..a344ec2b74 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -234,7 +234,7 @@ stages: steps: # The template job needs a log, otherwise it writes a warning. We can disable log uploading only for # the whole stage, which is not what we want to do. So we write an empty file instead. - - pwsh: 'New-Item -Type file -Force "$(Build.SourcesDirectory)/artifacts/logs/$(_BuildConfig)/empty.log"' + - pwsh: 'New-Item -Type file -Force "$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/empty.log"' name: 'Add_empty_logfile' # Download the built packages into local package source, as if we built them on this machine. - task: DownloadPipelineArtifact@2