Skip to content

Commit d475b4b

Browse files
committed
adjusted the build scripts
1 parent 329cedb commit d475b4b

File tree

7 files changed

+12
-14
lines changed

7 files changed

+12
-14
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ name: Build
33
on:
44
push:
55
branches:
6-
- master
76
- main
87
- 'fix/*'
98
- 'feature/*'
109

1110
pull_request:
1211
branches:
13-
- master
1412
- main
1513

1614
repository_dispatch:

.github/workflows/codeql-analysis.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ name: CodeQL
22

33
on:
44
push:
5-
branches: [ main, master ]
5+
branches:
6+
- main
7+
68
pull_request:
7-
branches: [ main, master ]
9+
branches:
10+
- main
11+
812
schedule:
9-
- cron: '41 21 * * 2'
13+
- cron: '0 12 * * *'
1014

1115
jobs:
1216
analyze:
@@ -17,7 +21,7 @@ jobs:
1721
fail-fast: false
1822
matrix:
1923
language: [ 'csharp' ]
20-
24+
2125
steps:
2226
- name: Checkout repository
2327
uses: actions/checkout@v2
@@ -31,4 +35,4 @@ jobs:
3135
uses: github/codeql-action/autobuild@v1
3236

3337
- name: Perform CodeQL Analysis
34-
uses: github/codeql-action/analyze@v1
38+
uses: github/codeql-action/analyze@v1

.github/workflows/format.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ name: Validate Commit
33
on:
44
push:
55
branches:
6-
- master
76
- main
87
- 'fix/*'
98
- 'feature/*'
109

1110
pull_request:
1211
branches:
13-
- master
1412
- main
1513

1614
jobs:

azure-pipelines.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
trigger:
22
branches:
33
include:
4-
- master
54
- main
65
- fix/*
76
- feature/*
87
pr:
98
branches:
109
include:
11-
- master
1210
- main
1311

1412
variables:

build/release.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Task("Release-Notes")
2121
Milestone = parameters.Version.Milestone,
2222
Name = parameters.Version.Milestone,
2323
Prerelease = false,
24-
TargetCommitish = "master"
24+
TargetCommitish = "main"
2525
});
2626

2727
GitReleaseManagerAddAssets(token, repoOwner, repository, parameters.Version.Milestone, assets);

build/utils/parameters.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public class BuildParameters
149149

150150
WyamAdditionalSettings = new Dictionary<string, object>
151151
{
152-
{ "BaseEditUrl", "https://github.com/gittools/GitVersion/tree/master/docs/input/" },
152+
{ "BaseEditUrl", "https://github.com/gittools/GitVersion/tree/main/docs/input/" },
153153
{ "SourceFiles", context.MakeAbsolute(Paths.Directories.Source) + "/**/{!bin,!obj,!packages,!*.Tests,!GitTools.*,}/**/*.cs" },
154154
{ "Title", "GitVersion" },
155155
{ "IncludeGlobalNamespace", false }

build/utils/utils.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static bool IsOnMainBranch(this ICakeContext context)
5858

5959
context.Information("Repository Branch: {0}" , repositoryBranch);
6060

61-
return !string.IsNullOrWhiteSpace(repositoryBranch) && StringComparer.OrdinalIgnoreCase.Equals("master", repositoryBranch);
61+
return !string.IsNullOrWhiteSpace(repositoryBranch) && StringComparer.OrdinalIgnoreCase.Equals("main", repositoryBranch);
6262
}
6363

6464
public static bool IsBuildTagged(this ICakeContext context)

0 commit comments

Comments
 (0)