Skip to content

Commit e498936

Browse files
authored
Merge pull request #349 from mjcheetham/main-rename
Update CI for rename of default branch to main (and drop the "beta" moniker)
2 parents d9d62c7 + 82a67fb commit e498936

File tree

8 files changed

+11
-13
lines changed

8 files changed

+11
-13
lines changed

.azure-pipelines/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
trigger:
2-
- master
2+
- main
33

44
variables:
55
configuration: Release

.azure-pipelines/pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pr:
2-
- master
2+
- main
33
- release
44

55
variables:

.github/workflows/build-installers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: Build-Installers
33
on:
44
workflow_dispatch:
55
push:
6-
branches: [ master, release ]
6+
branches: [ main, release ]
77
pull_request:
8-
branches: [ master ]
8+
branches: [ main ]
99

1010
jobs:
1111
linux:

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: GCM-Core
33
on:
44
workflow_dispatch:
55
push:
6-
branches: [ master, linux ]
6+
branches: [ main, linux ]
77
pull_request:
8-
branches: [ master, linux ]
8+
branches: [ main, linux ]
99

1010
jobs:
1111
validate_gcm:

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Git Credential Manager Core
22

3-
Branch|Status
4-
-|-
5-
master|[![Build Status](https://mseng.visualstudio.com/AzureDevOps/_apis/build/status/Teams/VCDesktop/Git-Credential-Manager-Core/GCM-CI?branchName=master)](https://mseng.visualstudio.com/AzureDevOps/_build/latest?definitionId=7861&branchName=master)
3+
[![Build Status](https://github.com/microsoft/Git-Credential-Manager-Core/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/microsoft/Git-Credential-Manager-Core/actions/workflows/continuous-integration.yml)
64

75
---
86

docs/azrepos-users-and-tokens.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ The Azure Repos host provider supports creating multiple types of credential:
88
- Microsoft identity OAuth tokens (experimental)
99

1010
To select which type of credential the Azure Repos host provider will create
11-
and use, you can set the [`credential.azreposCredentialType`](https://github.com/microsoft/Git-Credential-Manager-Core/blob/master/docs/configuration.md#credentialazreposcredentialtype-experimental)
12-
configuration entry (or [`GCM_AZREPOS_CREDENTIALTYPE`](https://github.com/microsoft/Git-Credential-Manager-Core/blob/master/docs/environment.md#GCM_AZREPOS_CREDENTIALTYPE-experimental)
11+
and use, you can set the [`credential.azreposCredentialType`](configuration.md#credentialazreposcredentialtype-experimental)
12+
configuration entry (or [`GCM_AZREPOS_CREDENTIALTYPE`](environment.md#GCM_AZREPOS_CREDENTIALTYPE-experimental)
1313
environment variable).
1414

1515
### Azure DevOps personal access tokens

src/windows/Installer.Windows/Setup.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define GcmPublisherUrl "https://www.microsoft.com"
3636
#define GcmCopyright "Copyright (c) Microsoft 2020"
3737
#define GcmUrl "https://aka.ms/gcmcore"
38-
#define GcmReadme "https://github.com/microsoft/Git-Credential-Manager-Core/blob/master/README.md"
38+
#define GcmReadme "https://github.com/microsoft/Git-Credential-Manager-Core/blob/main/README.md"
3939
#define GcmRepoRoot "..\..\.."
4040
#define GcmAssets GcmRepoRoot + "\assets"
4141
#define GcmExe "git-credential-manager-core.exe"

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "2.0-beta",
3+
"version": "2.0",
44
"publicReleaseRefSpec": [
55
"^refs/heads/release$"
66
],

0 commit comments

Comments
 (0)