Skip to content

Commit 5aac0db

Browse files
authored
Move src/SourceBuild/tarball/* up one folder (#15166)
1 parent 1182808 commit 5aac0db

File tree

159 files changed

+12
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+12
-11
lines changed

.vsts-ci.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -373,11 +373,12 @@ stages:
373373
# the VMR synchronization step is run to validate that the PR can be merged and later
374374
# synchronized into the VMR without problems.
375375
# You can do this by allowing the Synchronize_VMR stage from above in PRs.
376-
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
377-
- template: eng/pipelines/templates/stages/vmr-build.yml
378-
parameters:
379-
vmrBranch: ${{ parameters.vmrBranch }}
380-
isBuiltFromVmr: false
376+
# TODO - Temporarily disabled (https://github.com/dotnet/source-build/issues/3184)
377+
# - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
378+
# - template: eng/pipelines/templates/stages/vmr-build.yml
379+
# parameters:
380+
# vmrBranch: ${{ parameters.vmrBranch }}
381+
# isBuiltFromVmr: false
381382

382383
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
383384
- stage: Publish

eng/vmr-sync.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
###
2323
### The whole process can be reproduced locally easily by running this script.
2424
### The patches are located in a folder in the 'dotnet/installer' repository.
25-
### At the moment of writing, the location is 'src/SourceBuild/tarball/patches' but to get
25+
### At the moment of writing, the location is 'src/SourceBuild/patches' but to get
2626
### the up-to-date location, please see the 'patchesPath' property in
2727
### https://github.com/dotnet/dotnet/blob/main/src/source-mappings.json
2828
###

src/SourceBuild/README.md

+1-1

src/SourceBuild/tarball/content/eng/bootstrap/README.template.md renamed to src/SourceBuild/content/eng/bootstrap/README.template.md

+1-1

src/SourceBuild/tarball/content/prereqs/packages/archive/_

Whitespace-only changes.

src/SourceBuild/tarball/content/prereqs/packages/prebuilt/_

Whitespace-only changes.

src/VirtualMonoRepo/source-mappings.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
{
1111
// Location within the VMR where the source-build patches are stored
1212
// These patches are applied on top of the code synchronized into the VMR
13-
"patchesPath": "src/installer/src/SourceBuild/tarball/patches",
13+
"patchesPath": "src/installer/src/SourceBuild/patches",
1414

1515
// Some files are copied outside of the src/ directory into other locations
1616
// When files in the source paths are changed, they are automatically synchronized too
1717
"additionalMappings": [
1818
{
19-
"source": "src/installer/src/SourceBuild/tarball/content",
19+
"source": "src/installer/src/SourceBuild/content",
2020
"destination": ""
2121
},
2222
{
@@ -82,7 +82,7 @@
8282
"defaultRemote": "https://github.com/dotnet/installer",
8383
"exclude": [
8484
// We don't need the tarball content in the VMR again, it's already copied in the root
85-
"src/SourceBuild/tarball/content/**/*"
85+
"src/SourceBuild/content/**/*"
8686
]
8787
},
8888
{

0 commit comments

Comments
 (0)