diff --git a/.github/workflows/README.md b/.github/workflows/README.md new file mode 100644 index 0000000..bfd8cc9 --- /dev/null +++ b/.github/workflows/README.md @@ -0,0 +1,13 @@ +# The workflow + + edge main + ^ \ ^ + | \------2--\ | + 1 \ 3 + | \ | + development <-4-- patch + +1. Releasing a new 'edge' version. +2. Moving an 'edge' version to stable. +3. Releasing a stable version +4. Aligning bug fixes with the new features. \ No newline at end of file diff --git a/.github/workflows/development-binaries.yaml b/.github/workflows/development-binaries.yaml index 2d70da3..21b1be9 100644 --- a/.github/workflows/development-binaries.yaml +++ b/.github/workflows/development-binaries.yaml @@ -3,7 +3,7 @@ name: Development Binaries on: push: branches: - - dev/1.6.x + - development jobs: binaries: diff --git a/.github/workflows/development-tag.yaml b/.github/workflows/development-tag.yaml index 23db34c..198d9e6 100644 --- a/.github/workflows/development-tag.yaml +++ b/.github/workflows/development-tag.yaml @@ -3,7 +3,7 @@ name: Development Tag on: push: branches: - - dev/1.6.x + - development jobs: docker: diff --git a/pull_request_template.md b/pull_request_template.md index 75eb426..3190e7b 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -7,8 +7,8 @@ * [ ] I have read the code of conduct. * [ ] I am submitting to the correct base branch ### Changes that modify the db structure