From df6247dade96fcfbb050294d42c25d4a1e16a606 Mon Sep 17 00:00:00 2001 From: Amisha Singla Date: Fri, 25 Oct 2024 17:08:17 -0500 Subject: [PATCH] Use major/minor/patch instead of release/minor/patch; Default to patch in case branch name not prefixed accordingly --- .github/pull_request_template.md | 2 +- .github/workflows/release.yml | 2 +- README.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 34a4b107..b4d58ed2 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -20,7 +20,7 @@ change is, and why it is being made, with enough context for anyone to understan ### Release planning - [ ] I've decided if this PR requires a new major/minor/patch version accordingly to - [semver](https://semver.org/), and I've changed the name of the BRANCH to release/_ , feature/_ or patch/\* . + [semver](https://semver.org/), and I've changed the name of the BRANCH to major/_ , minor/_ or patch/\* . ### What diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a3173c58..3d6364ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,7 +52,7 @@ jobs: elif [[ $BRANCH_NAME =~ ^feature/ ]]; then VERSION_PARTS[1]=$((VERSION_PARTS[1] + 1)) VERSION_PARTS[2]=0 - elif [[ $BRANCH_NAME =~ ^patch/ ]]; then + else VERSION_PARTS[2]=$((VERSION_PARTS[2] + 1)) fi NEXT_VERSION="v${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.${VERSION_PARTS[2]}" diff --git a/README.md b/README.md index b2c59333..b5ff5779 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ The Stellar-ETL is a data pipeline that allows users to extract data from the hi Pay attention, it is very important to know if your modification to this repository is a release (breaking changes), a feature (functionalities) or a patch(to fix bugs). With that information, create your branch name like this: -- `release/` -- `feature/` +- `major/` +- `minor/` - `patch/` If branch is already made, just rename it _before passing the pull request_.