-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
Showing
4 changed files
with
19 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
name: "build-test-release" | ||
on: | ||
workflow_dispatch: | ||
push: | ||
branches: | ||
- "main" | ||
|
@@ -33,7 +32,7 @@ jobs: | |
with: | ||
python-version: "3.7" | ||
- run: | | ||
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/v1.6.24/scripts/download-actionlint.bash) | ||
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/v1.6.26/scripts/download-actionlint.bash) | ||
- uses: pre-commit/[email protected] | ||
|
||
publish: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,5 +24,3 @@ header: | |
- "README.md" | ||
- "LICENSE" | ||
- ".*" | ||
|
||
comment: on-failure |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters