Skip to content

Commit 744aa02

Browse files
authored
Update some internal guidelines (#18052)
1 parent 1b15b6c commit 744aa02

File tree

1 file changed

+21
-3
lines changed

1 file changed

+21
-3
lines changed

INTERNAL.md

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ their respective branches.
3838

3939
[VS 16.1](https://dev.azure.com/devdiv/DevDiv/_release?definitionId=1669&_a=releases)
4040

41-
VS 16.0 and prior were done manually
41+
VS 16.0 and prior were done manually.
4242

4343
## VS Insertions as part of the build definition
4444

@@ -64,6 +64,7 @@ it's a good idea to check the previous link for any old or stalled insertions in
6464
Update the `insertTargetBranch` value at the bottom of `azure-pipelines.yml` in the appropriate release branch. E.g., when VS 17.3 snapped and switched to ask mode, [this PR](https://github.com/dotnet/fsharp/pull/13456/files) correctly updates the insertion target so that future builds from that F# branch will get auto-inserted to VS.
6565

6666
### When VS `main` is open for insertions for preview releases of VS:
67+
6768
0. Disable auto-merges from `main` to **current** release branch, please make a change for the following file and create a pull request:
6869
https://github.com/dotnet/roslyn-tools/blob/6d7c182c46f8319d7922561e2c1586c7aadce19e/src/GitHubCreateMergePRs/config.xml#L52-L74
6970
> You should comment out the `main -> release/devXX.X` flow until step #4 is completed (`<merge from="main" to="release/dev17.13" />`)
@@ -131,6 +132,23 @@ Since github issue filtering is currently not flexible enough, that query was ge
131132
Invoke-WebRequest -Uri "https://api.github.com/repos/dotnet/fsharp/labels?per_page=100" | ConvertFrom-Json | % { $_.name } | ? { $_.StartsWith("Area-") } | % { Write-Host -NoNewLine ('-label:"' + $_ + '" ') }
132133
```
133134

134-
## Other links
135+
## Fix problems with the internal source mirror
136+
137+
The repo is [here](https://dev.azure.com/dnceng/internal/_git/dotnet-fsharp), the CI is [here](https://dnceng.visualstudio.com/internal/_build?definitionId=499).
138+
139+
If something breaks in the CI there and you want to experiment, the general workflow is the following:
140+
1. Make a branch
141+
2. Make a change
142+
3. Run the build from your branch. If needed, set the "skipTests" variable to "true" - can save time at this stage.
143+
4. Once the problem and the fix is identified, make a PR to THIS (dotnet/fsharp) repo - it will propagate to the internal mirror just afterwards.
144+
5. Delete all your work in the internal repo.
145+
146+
**DO NOT** try to push to the internal repo - this will mess up the flows. **DO NOT** create PRs to not confuse anyone.
147+
148+
You need the following permissions to do the above investigations:
149+
- "Generic contribute"
150+
- "Create branch"
151+
- "Queue builds"
152+
- "Edit queue build configuration"
135153

136-
[Internal source mirror](https://dev.azure.com/dnceng/internal/_git/dotnet-fsharp).
154+
If anything, reach out to the "First Responders" team.

0 commit comments

Comments
 (0)