@@ -158,22 +158,22 @@ publish: dist publish-confirm ## package and upload a release
158
158
twine upload dist/*
159
159
160
160
.PHONY : bumpversion-release
161
- bumpversion-release : # # Merge master to stable and bumpversion release
161
+ bumpversion-release : # # Merge main to stable and bumpversion release
162
162
git checkout stable || git checkout -b stable
163
- git merge --no-ff master -m" make release-tag: Merge branch 'master ' into stable"
163
+ git merge --no-ff main -m" make release-tag: Merge branch 'main ' into stable"
164
164
bumpversion release
165
165
git push --tags origin stable
166
166
167
167
.PHONY : bumpversion-release-test
168
- bumpversion-release-test : # # Merge master to stable and bumpversion release
168
+ bumpversion-release-test : # # Merge main to stable and bumpversion release
169
169
git checkout stable || git checkout -b stable
170
- git merge --no-ff master -m" make release-tag: Merge branch 'master ' into stable"
170
+ git merge --no-ff main -m" make release-tag: Merge branch 'main ' into stable"
171
171
bumpversion release --no-tag
172
172
@echo git push --tags origin stable
173
173
174
174
.PHONY : bumpversion-patch
175
- bumpversion-patch : # # Merge stable to master and bumpversion patch
176
- git checkout master
175
+ bumpversion-patch : # # Merge stable to main and bumpversion patch
176
+ git checkout main
177
177
git merge stable
178
178
bumpversion --no-tag patch
179
179
git push
@@ -192,7 +192,7 @@ bumpversion-major: ## Bump the version the next major skipping the release
192
192
193
193
.PHONY : bumpversion-revert
194
194
bumpversion-revert : # # Undo a previous bumpversion-release
195
- git checkout master
195
+ git checkout main
196
196
git branch -D stable
197
197
198
198
CLEAN_DIR := $(shell git status --short | grep -v ??)
@@ -205,10 +205,10 @@ ifneq ($(CLEAN_DIR),)
205
205
$(error There are uncommitted changes)
206
206
endif
207
207
208
- .PHONY : check-master
209
- check-master : # # Check if we are in master branch
210
- ifneq ($(CURRENT_BRANCH ) ,master )
211
- $(error Please make the release from master branch\n)
208
+ .PHONY : check-main
209
+ check-main : # # Check if we are in main branch
210
+ ifneq ($(CURRENT_BRANCH ) ,main )
211
+ $(error Please make the release from main branch\n)
212
212
endif
213
213
214
214
.PHONY : check-history
@@ -218,7 +218,7 @@ ifeq ($(CHANGELOG_LINES),0)
218
218
endif
219
219
220
220
.PHONY : check-release
221
- check-release : check-clean check-master check-history # # Check if the release can be made
221
+ check-release : check-clean check-main check-history # # Check if the release can be made
222
222
@echo " A new release can be made"
223
223
224
224
.PHONY : release
@@ -228,10 +228,10 @@ release: check-release bumpversion-release publish bumpversion-patch
228
228
release-test : check-release bumpversion-release-test publish-test bumpversion-revert
229
229
230
230
.PHONY : release-candidate
231
- release-candidate : check-master publish bumpversion-candidate
231
+ release-candidate : check-main publish bumpversion-candidate
232
232
233
233
.PHONY : release-candidate-test
234
- release-candidate-test : check-clean check-master publish-test
234
+ release-candidate-test : check-clean check-main publish-test
235
235
236
236
.PHONY : release-minor
237
237
release-minor : check-release bumpversion-minor release
0 commit comments