v6 RTM

Servarr · Nov 5, 2021 · d50e0fd · d50e0fd
1 parent 51a08e2
commit d50e0fd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -2,19 +2,19 @@ parameters:
 - name: runtimeBranch
   displayName: Tag for runtime repository
   type: string
-  default: v6.0.0-rc.2
+  default: v6.0.0
 - name: aspBranch
   displayName: Tag for aspnetcore repository
   type: string
-  default: v6.0.0-rc.2
+  default: v6.0.0
 - name: sdkBranch
   displayName: Tag for sdk repository
   type: string
-  default: v6.0.100-rc.2
+  default: v6.0.100-rtm
 - name: installerBranch
   displayName: Tag for installer repository
   type: string
-  default: v6.0.100-rc.2
+  default: v6.0.100-rtm
 
 variables:
   runCounter: $[counter('runNumber', 1)]
@@ -25,27 +25,28 @@ resources:
     type: github
     endpoint: Servarr
     name: dotnet/runtime
-    ref: release/5.0
+    ref: release/6.0
   - repository: aspnetcore
     type: github
     endpoint: Servarr
     name: dotnet/aspnetcore
-    ref: release/5.0
+    ref: release/6.0
   - repository: sdk
     type: github
     endpoint: Servarr
     name: dotnet/sdk
-    ref: release/5.0.1xx
+    ref: release/6.0.1xx
   - repository: installer
     type: github
     endpoint: Servarr
     name: dotnet/installer
-    ref: release/5.0.1xx
+    ref: release/6.0.1xx
 
 trigger:
   branches:
     include:
     - master
+    - v6
 
 pr:
 - master
@@ -72,7 +73,7 @@ stages:
           - checkout: runtime
           - bash: |
               set -e
-              git -C runtime tag | grep ${{ parameters.runtimeBranch }} | xargs git -C runtime checkout
+              git -C runtime checkout ${{ parameters.runtimeBranch }}
               git -C runtime cherry-pick -n 3633a7d0930abaca701385c1059b80ca157e98c6
               git -C runtime cherry-pick -n 3e6d492bdf6fbf2d8af3871379f31dcc6e27716b
               sed -i '/\/dnceng\/internal\//d' runtime/NuGet.config
@@ -138,7 +139,7 @@ stages:
             submodules: true
           - bash: |
               set -e
-              git -C aspnetcore tag | grep ${{ parameters.aspBranch }} | xargs git -C aspnetcore checkout
+              git -C aspnetcore checkout ${{ parameters.aspBranch }}
               git -C aspnetcore submodule update --init
               sed -i '/linux-x64;/a \ \ \ \ \ \ freebsd-x64;' aspnetcore/Directory.Build.props
               sed -i '/<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-x64" \/>/a \ \ \ \ <LatestPackageReference Include="Microsoft.NETCore.App.Runtime.freebsd-x64" \/>' aspnetcore/eng/Dependencies.props

diff --git a/common.sh b/common.sh
@@ -5,7 +5,7 @@ set -e
 function calculate_build_id()
 {
     local TAG=$1
-    local REGEX='-(preview|rc)\.[0-9]\.([0-9]{5})\.([0-9]{1,2})'
+    local REGEX='-(preview|rc|rtm)\.[0-9]\.([0-9]{5})\.([0-9]{1,2})'
 
     if [[ $TAG =~ $REGEX ]]
     then