From 0950d88f6bf36efc6abf00ccba4173095e5e06ea Mon Sep 17 00:00:00 2001 From: crupest Date: Mon, 20 Jul 2020 20:42:42 +0800 Subject: Update ci and README.md . --- .github/workflows/cd-version.yaml | 4 +--- .github/workflows/cd.yaml | 6 ++---- .github/workflows/ci.yaml | 8 ++------ README.md | 12 ++++++++---- Timeline/ClientApp | 2 +- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/.github/workflows/cd-version.yaml b/.github/workflows/cd-version.yaml index 6d19cca5..72531eef 100644 --- a/.github/workflows/cd-version.yaml +++ b/.github/workflows/cd-version.yaml @@ -1,11 +1,9 @@ -name: Build And Upload Versioned Docker Image +name: Version CD on: push: tags: - "v[0-9]+.[0-9]+.[0-9]+*" - paths-ignore: - - "**/README.md" jobs: deploy: diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index a82b68af..4ae002c4 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -1,10 +1,8 @@ -name: Build And Upload Latest Docker Image +name: CD on: push: - branches: [master] - paths-ignore: - - "**/README.md" + branches: [release] jobs: deploy: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4108ad1f..b59f94fb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,13 +2,9 @@ name: CI on: push: - branches: [dev] - paths-ignore: - - "**/README.md" + branches: [master] pull_request: - branches: [dev] - paths-ignore: - - "**/README.md" + branches: [master] jobs: build: diff --git a/README.md b/README.md index c0d05078..4693faec 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,13 @@ The final product is hosting on my [Tencent Cloud](https://cloud.tencent.com/) C Feel free to comment by opening an issue. +## About Development + +I currently actively develop this app on [CODING](https://coding.net/) for better connection in China and better tasks management, which includes issue track and pull requests. But I regularly sync the github repo manually (as github has no mirror feature). And you can also open issue here and I'll read it. + ## Build Status -| usage | branch | badge | -| ---------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------- | -| docker container | `master` | ![Build And Upload Docker Image](https://github.com/crupest/Timeline/workflows/Build%20And%20Upload%20Docker%20Image/badge.svg) | -| routine build | `dev` | ![Routine Build And Test](https://github.com/crupest/Timeline/workflows/CI/badge.svg) | +| usage | branch | badge | +| ---------------- | --------- | -------------------------------------------------------------------------------------------- | +| docker container | `release` | ![Build And Upload Docker Image](https://github.com/crupest/Timeline/workflows/CD/badge.svg) | +| routine build | `master` | ![Routine Build And Test](https://github.com/crupest/Timeline/workflows/CI/badge.svg) | diff --git a/Timeline/ClientApp b/Timeline/ClientApp index 35e9755b..70f25608 160000 --- a/Timeline/ClientApp +++ b/Timeline/ClientApp @@ -1 +1 @@ -Subproject commit 35e9755b7693511ab1b24735ecb7755514ed6293 +Subproject commit 70f256087c3218f9d0ea504f6e323a436c0fc6eb -- cgit v1.2.3