From d50eb949672a15414d74c120fc17b2fee6c6f7df Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 20 Mar 2024 11:07:45 -0700 Subject: [PATCH 1/3] Only run publish at join point (#714) (cherry picked from commit 1ed00a9ab199b9a20ad2e65b8164ed81aa7f4031) --- eng/azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index 2fe59e9b17..725d61ab53 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -67,7 +67,7 @@ extends: os: macOS steps: - bash: | - ./build.sh --arch x64 --restore --build --pack --publish --ci --configuration $(_BuildConfig) /p:PackageRID=osx-x64 /p:AssetManifestOS=osx /p:PlatformName=x64 $(_InternalBuildArgs) + ./build.sh --arch x64 --restore --build --pack --ci --configuration $(_BuildConfig) /p:PackageRID=osx-x64 /p:AssetManifestOS=osx /p:PlatformName=x64 $(_InternalBuildArgs) displayName: Build - task: 1ES.PublishPipelineArtifact@1 inputs: @@ -88,7 +88,7 @@ extends: os: macOS steps: - bash: | - ./build.sh --arch arm64 --restore --build --pack --publish --ci --configuration $(_BuildConfig) /p:PackageRID=osx-arm64 /p:AssetManifestOS=osx /p:PlatformName=arm64 $(_InternalBuildArgs) + ./build.sh --arch arm64 --restore --build --pack --ci --configuration $(_BuildConfig) /p:PackageRID=osx-arm64 /p:AssetManifestOS=osx /p:PlatformName=arm64 $(_InternalBuildArgs) displayName: Build - task: 1ES.PublishPipelineArtifact@1 inputs: @@ -110,7 +110,7 @@ extends: os: linux steps: - bash: | - ./build.sh --arch x64 --restore --build --pack --publish --ci --configuration $(_BuildConfig) /p:PackageRID=linux-x64 /p:AssetManifestOS=linux /p:PlatformName=x64 $(_InternalBuildArgs) + ./build.sh --arch x64 --restore --build --pack --ci --configuration $(_BuildConfig) /p:PackageRID=linux-x64 /p:AssetManifestOS=linux /p:PlatformName=x64 $(_InternalBuildArgs) displayName: Build - task: 1ES.PublishPipelineArtifact@1 inputs: @@ -131,7 +131,7 @@ extends: os: linux steps: - bash: | - ./build.sh --arch arm64 --restore --build --pack --publish --ci --configuration $(_BuildConfig) /p:PackageRID=linux-arm64 /p:AssetManifestOS=linux /p:PlatformName=arm64 $(_InternalBuildArgs) + ./build.sh --arch arm64 --restore --build --pack --ci --configuration $(_BuildConfig) /p:PackageRID=linux-arm64 /p:AssetManifestOS=linux /p:PlatformName=arm64 $(_InternalBuildArgs) displayName: Build - task: 1ES.PublishPipelineArtifact@1 inputs: @@ -152,7 +152,7 @@ extends: os: linux steps: - bash: | - ./build.sh --arch x64 --restore --build --pack --publish --ci --configuration $(_BuildConfig) /p:PackageRID=linux-musl-x64 /p:AssetManifestOS=linux-musl /p:PlatformName=x64 $(_InternalBuildArgs) + ./build.sh --arch x64 --restore --build --pack --ci --configuration $(_BuildConfig) /p:PackageRID=linux-musl-x64 /p:AssetManifestOS=linux-musl /p:PlatformName=x64 $(_InternalBuildArgs) displayName: Build - task: 1ES.PublishPipelineArtifact@1 inputs: @@ -173,7 +173,7 @@ extends: os: linux steps: - bash: | - ./build.sh --arch arm64 --restore --build --pack --publish --ci --configuration $(_BuildConfig) /p:PackageRID=linux-musl-arm64 /p:AssetManifestOS=linux-musl /p:PlatformName=arm64 $(_InternalBuildArgs) + ./build.sh --arch arm64 --restore --build --pack --ci --configuration $(_BuildConfig) /p:PackageRID=linux-musl-arm64 /p:AssetManifestOS=linux-musl /p:PlatformName=arm64 $(_InternalBuildArgs) displayName: Build - task: 1ES.PublishPipelineArtifact@1 inputs: From 41203a21d514c14a6ba7fb259ebf3b548f9c064f Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 20 Mar 2024 15:07:16 -0700 Subject: [PATCH 2/3] Only sign and publish once --- eng/azure-pipelines.yml | 7 +------ eng/common-variables.yml | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index 725d61ab53..edebaa0582 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -291,12 +291,7 @@ extends: artifact: Packages_linux_musl_arm64 path: 'artifacts/packages' - powershell: | - ./eng/common/build.ps1 -ci -configuration $(_BuildConfig) -restore -sign -publish /p:PackageRID=osx-x64 /p:AssetManifestOS=osx /p:PlatformName=x64 $(_InternalBuildArgs) - ./eng/common/build.ps1 -ci -configuration $(_BuildConfig) -restore -sign -publish /p:PackageRID=osx-arm64 /p:AssetManifestOS=osx /p:PlatformName=arm64 $(_InternalBuildArgs) - ./eng/common/build.ps1 -ci -configuration $(_BuildConfig) -restore -sign -publish /p:PackageRID=linux-x64 /p:AssetManifestOS=linux /p:PlatformName=x64 $(_InternalBuildArgs) - ./eng/common/build.ps1 -ci -configuration $(_BuildConfig) -restore -sign -publish /p:PackageRID=linux-arm64 /p:AssetManifestOS=linux /p:PlatformName=arm64 $(_InternalBuildArgs) - ./eng/common/build.ps1 -ci -configuration $(_BuildConfig) -restore -sign -publish /p:PackageRID=linux-musl-x64 /p:AssetManifestOS=linux-musl /p:PlatformName=x64 $(_InternalBuildArgs) - ./eng/common/build.ps1 -ci -configuration $(_BuildConfig) -restore -sign -publish /p:PackageRID=linux-musl-arm64 /p:AssetManifestOS=linux-musl /p:PlatformName=arm64 $(_InternalBuildArgs) + ./eng/common/build.ps1 -ci -configuration $(_BuildConfig) -restore -sign -publish /p:AssetManifestOS=unix-all $(_InternalBuildArgs) ############ Workloads BUILD ############ - job: Build_Workloads diff --git a/eng/common-variables.yml b/eng/common-variables.yml index c96cfae708..50f18402c0 100644 --- a/eng/common-variables.yml +++ b/eng/common-variables.yml @@ -12,7 +12,7 @@ variables: value: '' - name: _InternalPublishArg value: '' - - ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')) }}: + - ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), in(variables['Build.Reason'], 'Manual')) }}: - name: PostBuildSign value: false - ${{ else }}: From 75d9d6d9e16c320b4fe95f4ebc53ea52aa06b85d Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 20 Mar 2024 15:28:13 -0700 Subject: [PATCH 3/3] Set asset manifest file name --- eng/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index edebaa0582..381799979d 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -291,7 +291,7 @@ extends: artifact: Packages_linux_musl_arm64 path: 'artifacts/packages' - powershell: | - ./eng/common/build.ps1 -ci -configuration $(_BuildConfig) -restore -sign -publish /p:AssetManifestOS=unix-all $(_InternalBuildArgs) + ./eng/common/build.ps1 -ci -configuration $(_BuildConfig) -restore -sign -publish /p:AssetManifestFileName=unix-all.xml $(_InternalBuildArgs) ############ Workloads BUILD ############ - job: Build_Workloads