Skip to content

Commit

Permalink
Fix signing in PR runs (#31926)
Browse files Browse the repository at this point in the history
Make URCT copying unconditional to unblock installer tasks in debug
mode.

Thanks

Tomas
  • Loading branch information
trylek committed Feb 10, 2020
1 parent a4bc93f commit 5c6f5b1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 1 addition & 5 deletions eng/pipelines/installer/jobs/base-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,8 @@ jobs:
eq(parameters.isOfficialBuild, true),
ne(parameters.crossrootfsDir, '')) }}

# TODO: (Consolidation) Enable test signing during PR validation. https://github.com/dotnet/runtime/issues/1026
#
# CoreCLR only produces the UCRT redist file in Release config. When the redist file isn't
# present, signing fails. For now, only sign in official builds which only run Release mode.
- name: SignType
value: ''
value: test

# Set up non-PR build from internal project
- ${{ if eq(parameters.isOfficialBuild, true) }}:
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/src/build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<UcrtFilesToCopy Include="$(UniversalCRTSDKDir)Redist\ucrt\DLLs\$(BuildArch)\*.dll" />
</ItemGroup>

<Copy Condition="'$(BuildType)'=='Release' AND '$(BuildArch)' != 'arm64'"
<Copy Condition="'$(BuildArch)' != 'arm64'"
SourceFiles="@(UcrtFilesToCopy)"
DestinationFolder="$(BinDir)Redist\ucrt\DLLs\$(BuildArch)" />
</Target>
Expand Down

0 comments on commit 5c6f5b1

Please sign in to comment.