Merge branch 'main' into dev/grendel/as-on-windows

* main: [ci] Fix unsigned artifact uploading (#13)
dotnet · Feb 29, 2024 · dabb05f · dabb05f
2 parents 88b0f28 + 5e88061
commit dabb05f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/build-tools/automation/azure-pipelines.yml b/build-tools/automation/azure-pipelines.yml
@@ -39,6 +39,11 @@ variables:
     value: Real
   ${{ else }}:
     value: Test
+- name: ToolchainArtifactName
+  ${{ if or(startsWith(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(parameters.SignArtifactsOverride, 'true')) }}:
+    value: android-llvm-toolchain-signed
+  ${{ else }}:
+    value: android-llvm-toolchain-unsigned
 - name: TeamName
   value: XamarinAndroid
 - name: BUILD_DIR
@@ -154,7 +159,7 @@ extends:
             brew install cmake ninja ccache
           displayName: Install LLVM build dependencies
 
-        - script: brew install make xz
+        - script: export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install make xz
           displayName: Install Xamarin.Android Utilities build dependencies
 
         - script: bash ./build-llvm.sh
@@ -214,8 +219,8 @@ extends:
             targetPath: $(Build.StagingDirectory)/binlogs/sign-macos.binlog
             sbomEnabled: false
           - output: pipelineArtifact
-            displayName: Upload toolchain-signed artifact
-            artifactName: android-llvm-toolchain-signed
+            displayName: Upload toolchain artifact
+            artifactName: $(ToolchainArtifactName)
             targetPath: $(Build.StagingDirectory)/toolchain
         steps:
         - checkout: self
@@ -251,6 +256,7 @@ extends:
           inputs:
             projects: build-tools/automation/sign.proj
             arguments: >-
+              -t:Build,ZipOutput
               -p:SignType=$(MicroBuildSignType)
               -bl:$(Build.StagingDirectory)/binlogs/sign-macos.binlog
 
@@ -276,7 +282,7 @@ extends:
 
         - task: DownloadPipelineArtifact@2
           inputs:
-            artifactName: android-llvm-toolchain-signed
+            artifactName: $(ToolchainArtifactName)
             downloadPath: $(Build.SourcesDirectory)\artifacts
 
         - task: MicroBuildCodesignVerify@3

diff --git a/build-tools/automation/sign.proj b/build-tools/automation/sign.proj
@@ -30,8 +30,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="_ZipOutput"
-      AfterTargets="SignFiles" >
+  <Target Name="ZipOutput" >
     <ReadLinesFromFile File="$(OutDir)\darwin\llvm-version.txt" >
       <Output TaskParameter="Lines" ItemName="_VersionLines"/>
     </ReadLinesFromFile>