Skip to content

Commit

Permalink
build(makefile): replace 'master' with 'main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Michele-Alberti committed Feb 23, 2024
1 parent f9e0f67 commit d9602e5
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ help:
@echo -e " ${WHITE} package-test-publish:${NC} publish python package to TestPyPI"
@echo -e " ${WHITE} package-test-install:${NC} install package with pip from TestPyPI (use only in a test env)"
@echo -e " ${WHITE} pre-commit-run :${NC} runs pre-commit hooks"
@echo -e " ${WHITE} commitizen-bump :${NC} runs commitizen for releasing a new version on master branch"
@echo -e " ${WHITE} commitizen-push :${NC} use git to push commits on 'development' and 'master' branches"
@echo -e " ${WHITE} commitizen-bump :${NC} runs commitizen for releasing a new version on 'main' branch"
@echo -e " ${WHITE} commitizen-push :${NC} use git to push commits on 'development' and 'main' branches"
@echo -e "${RED}=======================|=========================================================================${NC}"
@echo ""

Expand Down Expand Up @@ -334,12 +334,12 @@ commitizen-bump:
conda activate ci-cd && \
git checkout development && \
git pull --ff-only && \
git checkout master && \
git checkout main && \
git pull --ff-only && \
git merge development --no-ff && \
cz bump --no-verify && \
git checkout development && \
git merge master --no-ff
git merge main --no-ff
@echo -e "${GREEN}done${NC}"

commitizen-push:
Expand All @@ -348,7 +348,7 @@ commitizen-push:
conda activate ci-cd && \
git checkout development && \
git pull --ff-only && \
git checkout master && \
git checkout main && \
git pull --ff-only && \
git push &&\
git push --tags &&\
Expand Down

0 comments on commit d9602e5

Please sign in to comment.