Skip to content

Change branching to "main is the future release, branches are for servicing" #18730

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 6 commits into from
Jul 4, 2025
Merged

Change branching to "main is the future release, branches are for servicing" #18730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9f307b6
Stop auto servicing from main
T-Gro Jul 4, 2025
55166fe
Update VS insertion mapping
T-Gro Jul 4, 2025
e68c7aa
Update Versions.props
T-Gro Jul 4, 2025
a3f78c2
Update Versions.props
T-Gro Jul 4, 2025
6fcaebc
Update FSharp.Compiler.Service.fsproj
T-Gro Jul 4, 2025
d01f51a
Merge branch 'main' into T-Gro-patch-change-branching
T-Gro Jul 4, 2025
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
4 changes: 0 additions & 4 deletions .config/service-branch-merge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
"release/dev17.14": {
"MergeToBranch": "main",
"ExtraSwitches": "-QuietComments"
},
"main": {
"MergeToBranch": "release/dev18.0",
"ExtraSwitches": "-QuietComments"
}
}
}
12 changes: 5 additions & 7 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,12 @@ trigger:

variables:
# Release branch for F#
# Should be 'current' release branch name, i.e. 'release/dev17.10' in dotnet/fsharp/refs/heads/main, 'release/dev17.10' in dotnet/fsharp/refs/heads/release/dev17.10 and 'release/dev17.9' in dotnet/fsharp/refs/heads/release/dev17.9
# Should **never** be 'main' in dotnet/fsharp/refs/heads/main, since it will start inserting to VS twice.
# The future "product" gets developed in main, so should be main in main.
# When servicing branch gets created, this should maintain the mapping between F# servicing and VS servicing branches
- name: FSharpReleaseBranchName
value: release/dev18.0
value: main
# VS Insertion branch name (NOT the same as F# branch)
# Should be previous release branch or 'main' in 'main' and 'main' in release branch
# (since for all *new* release branches we insert into VS main and for all *previous* releases we insert into corresponding VS release),
# i.e. 'rel/d17.9' *or* 'main' in dotnet/fsharp/refs/heads/main and 'main' in F# dotnet/fsharp/refs/heads/release/dev17.10 (latest release branch)
# ( for main we insert into VS main and for all *previous* releases we insert into corresponding VS release),
- name: VSInsertionTargetBranchName
value: main
- name: _TeamName
Expand Down Expand Up @@ -87,7 +85,7 @@ extends:
#-------------------------------------------------------------------------------------------------------------------#
# Signed build #
#-------------------------------------------------------------------------------------------------------------------#
# Localization: we only run it for specific release branches
# Localization: we only run it for main
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
- template: /eng/common/templates-official/job/onelocbuild.yml@self
parameters:
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PropertyGroup>
<!-- Don't use the built in support for pre-release iteration. The nuget repack task doesn't support
the iteration format at the moment. https://github.com/dotnet/arcade/issues/15919 -->
<FSharpPreReleaseIteration>6</FSharpPreReleaseIteration>
<FSharpPreReleaseIteration>7</FSharpPreReleaseIteration>
<PreReleaseVersionLabel>preview$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
<!-- These have to be in sync with latest release branch -->
<!-- F# Version components -->
Expand Down
Loading