Skip to content

Commit

Permalink
change feature branch convention from branch-X.X to vX.X
Browse files Browse the repository at this point in the history
  • Loading branch information
zimnx committed Jan 11, 2021
1 parent c882e6e commit b09bb23
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: Release docs
runs-on: ubuntu-latest
env:
LATEST_VERSION: v1.0.0
LATEST_VERSION: v1.0
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ def setup(sphinx):

# -- Options for multiversion extension ----------------------------------
# Whitelist pattern for tags (set to None to ignore all tags)
TAGS = ['v0.3.0', 'v1.0.0$']
TAGS = []
smv_tag_whitelist = multiversion_regex_builder(TAGS)
# Whitelist pattern for branches (set to None to ignore all branches)
BRANCHES = ['master']
BRANCHES = ['master', 'v0.3', 'v1.0']
smv_branch_whitelist = multiversion_regex_builder(BRANCHES)
# Whitelist pattern for remotes (set to None to use local branches only)
smv_remote_whitelist = r"^origin$"
Expand Down
2 changes: 1 addition & 1 deletion version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
set -euo pipefail

BRANCH=$(git rev-parse --abbrev-ref HEAD)
if [[ $BRANCH == branch-* ]]; then
if [[ $BRANCH =~ ^v[0-9]+\.[0-9]+$ ]]; then
echo $(git describe --tags --always --abbrev=0)
exit 0
fi
Expand Down

0 comments on commit b09bb23

Please sign in to comment.