Skip to content

Commit 6bfed0f

Browse files
committed
Fix incorrect filename in staging.artifactignore. Trying 30 sec interval for signing. Fix broken path in .gitignore. Hopefully get the download pattern right for publish-assets-and-packages.yml.
1 parent 97c05b5 commit 6bfed0f

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
.vs/
1010
.vscode/
1111
.tools/
12-
/build/loc/Properties/launchSettings.json
12+
/eng/tools/OneLocBuildSetup/Properties/launchSettings.json
1313

1414
# Build results, but not the debug folder under projectsystem
1515
[Aa]rtifacts/

eng/pipelines/staging.artifactignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
Codex/
77
VSSetup.obj/
88
MicroBuild/
9-
!MicroBuild/Output/Bootstrapper.json
9+
!MicroBuild/Output/BootstrapperInfo.json
1010
!MicroBuild/Staging/
1111
!MicroBuild/Verify/out/

eng/pipelines/templates/build-official-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ jobs:
5151
signType: ${{ parameters.SignType }}
5252
esrpSigning: true
5353

54-
# Gets the signconfig.xml from the MicroBuild Signing plugin and sets the retry interval to 60 seconds.
55-
# This reduces the calls to the signing API and pipeline log bloat.
56-
- powershell: . '$(Build.SourcesDirectory)/eng/scripts/SetSigningRetryInterval.ps1' -signConfigPath ((Get-ChildItem -Path '$(Build.StagingDirectory)/MicroBuild/Plugins/*/build/signconfig.xml').FullName) -intervalInSeconds 60
54+
# Gets the signconfig.xml from the MicroBuild Signing plugin and sets the retry interval to 30 seconds.
55+
# This reduces the calls to the signing API (potentially increasing signing speed) and reduces the pipeline log bloat when polling signing completion.
56+
- powershell: . '$(Build.SourcesDirectory)/eng/scripts/SetSigningRetryInterval.ps1' -signConfigPath ((Get-ChildItem -Path '$(Build.StagingDirectory)/MicroBuild/Plugins/*/build/signconfig.xml').FullName) -intervalInSeconds 30
5757
displayName: Set Signing Interval
5858
continueOnError: true
5959

eng/pipelines/templates/publish-assets-and-packages.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ jobs:
1414
artifact: $(Build.BuildNumber)
1515
# Only download the necessary files for publishing.
1616
patterns: |
17-
VSSetup/Insertion/
18-
packages/
17+
VSSetup/Insertion/**
18+
packages/**
1919
# Download the staging artifacts from the Build job.
2020
- download: current
2121
displayName: Download Staging Artifacts
2222
artifact: Staging
2323
# Only download the necessary files for publishing.
2424
patterns: |
25-
MicroBuild/
26-
OptProf/
25+
MicroBuild/**
26+
OptProf/**
2727
2828
###################################################################################################################################################################
2929
# PUBLISH INSERTION

0 commit comments

Comments
 (0)