Skip to content

[ci] Fix unsigned artifact uploading #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 29, 2024
Merged

[ci] Fix unsigned artifact uploading #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2339041
[ci] Fix unsigned artifact uploading
pjcollins Feb 28, 2024
976a4ef
Skip xz upgrade
pjcollins Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions build-tools/automation/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -276,7 +282,7 @@ extends:

- task: DownloadPipelineArtifact@2
inputs:
artifactName: android-llvm-toolchain-signed
artifactName: $(ToolchainArtifactName)
downloadPath: $(Build.SourcesDirectory)\artifacts

- task: MicroBuildCodesignVerify@3
Expand Down
3 changes: 1 addition & 2 deletions build-tools/automation/sign.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down