diff --git a/.build/Build.CI.cs b/.build/Build.CI.cs index adc59501f..cae0104ed 100644 --- a/.build/Build.CI.cs +++ b/.build/Build.CI.cs @@ -76,13 +76,13 @@ public static RocketSurgeonGitHubActionsConfiguration CiMiddleware(RocketSurgeon .PublishLogs() .FailFast = false; - job.Steps.Insert( - GetCheckStepIndex(job)+1, new RunStep("Create branch for tag (gitversion)") - { - If = "(github.ref_type == 'tag')", - Run = "git checkout -b ${{ github.ref_name }}" - } - ); +// job.Steps.Insert( +// GetCheckStepIndex(job)+1, new RunStep("Create branch for tag (gitversion)") +// { +// If = "(github.ref_type == 'tag')", +// Run = "git checkout -b ${{ github.ref_name }}" +// } +// ); return configuration; } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06e8e6762..e2764f951 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,10 +81,6 @@ jobs: with: clean: 'false' fetch-depth: '0' - - name: Create branch for tag (gitversion) - if: (github.ref_type == 'tag') - run: | - git checkout -b ${{ github.ref_name }} - name: NuGet Cache uses: actions/cache@v3 with: diff --git a/GitVersion.yml b/GitVersion.yml index 4197eeea7..ca5218739 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -3,9 +3,13 @@ mode: ContinuousDeployment continuous-delivery-fallback-tag: ci next-version: 0.1.0 branches: + main: + regex: ^master$|^main$ + mode: ContinuousDelivery + tag: preview next: regex: ^next$ - mode: ContinuousDeployment + mode: ContinuousDelivery tag: next increment: Major prevent-increment-of-merged-branch-version: false