Commit 7e6a5a9
authored
ci: make development in develop branch possible (#206)
This PR proposes to use `develop` branch as a development branch keeping
`main` branch stable in case of necessary bug fixes.
The proposed flow (documented in the README as well):
* we make our development in `develop` branch
* once we are ready to release, we make a PR from `develop` to `main`
branch, after the merge new tags will be created from the main `branch`
* go to first step in this list
In case we need to release a bug fix - we can create a PR to main, merge
it, new tags will be created, issue is solved and we can cherry-pick
this commit to the `develop` branch. The similar scenario is working in
the UCC repository right now and the results are quite good.
We can go even further and make a develop branch a default one in this
GitHub repository.
This PR removes existing pre-release from the develop branch -> we don't
want to confuse tags with the ones which will be released from `main`
branch. And essentially it is not necessary to have a release from
develop.1 parent 1e65154 commit 7e6a5a9
File tree
4 files changed
+19
-6
lines changed- .github/workflows
4 files changed
+19
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | 3 | | |
5 | 4 | | |
6 | 5 | | |
| |||
33 | 32 | | |
34 | 33 | | |
35 | 34 | | |
36 | | - | |
| 35 | + | |
37 | 36 | | |
38 | 37 | | |
39 | 38 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | | - | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | | - | |
| 20 | + | |
22 | 21 | | |
23 | 22 | | |
24 | 23 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
9 | 26 | | |
10 | 27 | | |
11 | 28 | | |
| |||
0 commit comments