Skip to content

Commit e6d8f6e

Browse files
author
Bertrand Thomas
committed
Merge branch 'feature/main-branch-rename' into 'main'
Rename master by main in pipelines and README See merge request devpro-labs/software/keeptrack!454
2 parents 98296ce + e17aed8 commit e6d8f6e

6 files changed

Lines changed: 568 additions & 560 deletions

File tree

.azure/pipelines/cd.json

Lines changed: 548 additions & 541 deletions
Large diffs are not rendered by default.

.azure/pipelines/ci.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,30 @@ trigger:
44
batch: false
55
branches:
66
include:
7-
- master
7+
- main
88
paths:
99
exclude:
1010
- README.md
1111

12-
pr:
13-
autoCancel: true
14-
branches:
15-
include:
16-
- master
17-
paths:
18-
exclude:
19-
- README.md
20-
- .azure/pipelines/nightly.yml
21-
- .azure/pipelines/pkg.yml
22-
- .azure/pipelines/cd.json
12+
pr: none
13+
# pr:
14+
# autoCancel: true
15+
# branches:
16+
# include:
17+
# - master
18+
# paths:
19+
# exclude:
20+
# - README.md
21+
# - .azure/pipelines/nightly.yml
22+
# - .azure/pipelines/pkg.yml
23+
# - .azure/pipelines/cd.json
2324

2425
schedules:
2526
- cron: "0 0 * * *"
2627
displayName: "Daily midnight build"
2728
branches:
2829
include:
29-
- master
30+
- main
3031
always: true
3132

3233
variables:

.azure/pipelines/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ schedules:
1515
displayName: "Daily midnight build"
1616
branches:
1717
include:
18-
- master
18+
- main
1919
always: true
2020

2121
variables:

.azure/pipelines/pkg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ trigger:
44
batch: false
55
branches:
66
include:
7-
- master
7+
- main
88
paths:
99
exclude:
1010
- README.md

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![GitLab Pipeline Status](https://gitlab.com/devpro-labs/software/keeptrack/badges/main/pipeline.svg)](https://gitlab.com/devpro-labs/software/keeptrack/-/pipelines)
44
[![coverage report](https://gitlab.com/devpro-labs/software/keeptrack/badges/main/coverage.svg)](https://gitlab.com/devpro-labs/software/keeptrack/-/commits/main)
5-
[![Build Status](https://dev.azure.com/devprofr/open-source/_apis/build/status/keeptrack-ci?branchName=master)](https://dev.azure.com/devprofr/open-source/_build/latest?definitionId=26&branchName=master)
5+
[![Build Status](https://dev.azure.com/devprofr/open-source/_apis/build/status/keeptrack-ci?branchName=main)](https://dev.azure.com/devprofr/open-source/_build/latest?definitionId=26&branchName=main)
66
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=devpro.keep-track&metric=alert_status)](https://sonarcloud.io/dashboard?id=devpro.keep-track)
77
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=devpro.keep-track&metric=coverage)](https://sonarcloud.io/dashboard?id=devpro.keep-track)
88

@@ -18,8 +18,8 @@ A SaaS free version is currently available for early adopters (contact the repos
1818

1919
Application frontend is a [web application](angular-bootstrap/README.md) (Single Page Application) written in TypeScript (Angular 16+).
2020

21-
Application backend is a [web API](dotnet/README.md) (REST) written in C# (.NET 7+).
21+
Application backend is a [web API](dotnet/README.md) (REST) written in C# (.NET 9).
2222

23-
Application data is persisted in a MongoDB (7.0) database.
23+
Application data is persisted in a MongoDB (8.0) database.
2424

2525
Application authentication is federated with Firebase Authentication and can be done from multiple providers (Google, GitHub, etc.).

dotnet/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Keeptrack .NET solution
22

3-
[![Build Status](https://dev.azure.com/devprofr/open-source/_apis/build/status/keeptrack-ci?branchName=master)](https://dev.azure.com/devprofr/open-source/_build/latest?definitionId=26&branchName=master)
3+
[![Build Status](https://dev.azure.com/devprofr/open-source/_apis/build/status/keeptrack-ci?branchName=main)](https://dev.azure.com/devprofr/open-source/_build/latest?definitionId=26&branchName=main)
44
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=devpro.keep-track&metric=alert_status)](https://sonarcloud.io/dashboard?id=devpro.keep-track)
55
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=devpro.keep-track&metric=coverage)](https://sonarcloud.io/dashboard?id=devpro.keep-track)
66

0 commit comments

Comments
 (0)