aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2022-04-12 15:22:10 +0800
committercrupest <crupest@outlook.com>2022-04-12 15:22:10 +0800
commitda0f0abb3d5b2941e2e7c545ec8faf681c26e72a (patch)
treee33275897c564f042283a94ec049b6a9c75e586e
parentad9e1ac4c09b50b04835326d471c55bb186ca1ff (diff)
downloadtimeline-da0f0abb3d5b2941e2e7c545ec8faf681c26e72a.tar.gz
timeline-da0f0abb3d5b2941e2e7c545ec8faf681c26e72a.tar.bz2
timeline-da0f0abb3d5b2941e2e7c545ec8faf681c26e72a.zip
...
-rw-r--r--.github/workflows/back-ci.yaml4
-rw-r--r--.github/workflows/front-ci.yaml4
-rw-r--r--README.md8
3 files changed, 8 insertions, 8 deletions
diff --git a/.github/workflows/back-ci.yaml b/.github/workflows/back-ci.yaml
index d489e1ae..80352279 100644
--- a/.github/workflows/back-ci.yaml
+++ b/.github/workflows/back-ci.yaml
@@ -2,11 +2,11 @@ name: Back End CI
on:
push:
- branches: [master]
+ branches: [main]
paths:
- "BackEnd/**"
pull_request:
- branches: [master]
+ branches: [main]
paths:
- "BackEnd/**"
diff --git a/.github/workflows/front-ci.yaml b/.github/workflows/front-ci.yaml
index 2373c48c..028f64d1 100644
--- a/.github/workflows/front-ci.yaml
+++ b/.github/workflows/front-ci.yaml
@@ -2,11 +2,11 @@ name: Front End CI
on:
push:
- branches: [master]
+ branches: [main]
paths:
- "FrontEnd/**"
pull_request:
- branches: [master]
+ branches: [main]
paths:
- "FrontEnd/**"
diff --git a/README.md b/README.md
index 2cb72984..80c17e0f 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@
This is the first web app of [me](https://github.com/crupest).
-The [front-end](https://github.com/crupest/Timeline/tree/master/FrontEnd) is written in [Typescript](https://www.typescriptlang.org/) and built with [React](https://reactjs.org/).
+The [front-end](https://github.com/crupest/Timeline/tree/main/FrontEnd) is written in [Typescript](https://www.typescriptlang.org/) and built with [React](https://reactjs.org/).
-The [back-end](https://github.com/crupest/Timeline/tree/master/BackEnd) is written in C# and built with [ASP.NET Core](https://github.com/dotnet/aspnetcore).
+The [back-end](https://github.com/crupest/Timeline/tree/main/BackEnd) is written in C# and built with [ASP.NET Core](https://github.com/dotnet/aspnetcore).
Feel free to comment by opening an issue.
@@ -14,6 +14,6 @@ Feel free to comment by opening an issue.
| usage | branch | badge |
| ---------------- | --------- | ----------------------------------------------------------------------------------------- |
-| routine build | `master` | ![Front End CI](https://github.com/crupest/Timeline/workflows/Front%20End%20CI/badge.svg) |
-| routine build | `master` | ![Back End CI](https://github.com/crupest/Timeline/workflows/Back%20End%20CI/badge.svg) |
+| routine build | `main` | ![Front End CI](https://github.com/crupest/Timeline/workflows/Front%20End%20CI/badge.svg) |
+| routine build | `main` | ![Back End CI](https://github.com/crupest/Timeline/workflows/Back%20End%20CI/badge.svg) |
| docker container | `release` | ![CD](https://github.com/crupest/Timeline/workflows/CD/badge.svg) |