From e392ca34a8827c988e7b8aafbbe180fa3462139c Mon Sep 17 00:00:00 2001 From: itchyny Date: Sat, 18 Sep 2021 23:48:00 +0900 Subject: [PATCH] switch the default branch to main --- .github/workflows/ci.yaml | 2 +- Makefile | 6 +++--- README.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 954a93a..4ecf920 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - main pull_request: jobs: diff --git a/Makefile b/Makefile index b7b4daf..91cf1d9 100644 --- a/Makefile +++ b/Makefile @@ -60,13 +60,13 @@ bump: $(GOBIN)/gobump ifneq ($(shell git status --porcelain),) $(error git workspace is dirty) endif -ifneq ($(shell git rev-parse --abbrev-ref HEAD),master) - $(error current branch is not master) +ifneq ($(shell git rev-parse --abbrev-ref HEAD),main) + $(error current branch is not main) endif @gobump up -w "$(VERSION_PATH)" git commit -am "bump up version to $(VERSION)" git tag "v$(VERSION)" - git push origin master + git push origin main git push origin "refs/tags/v$(VERSION)" .PHONY: upload diff --git a/README.md b/README.md index 58e87d6..5f6efa9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # mmv [![CI Status](https://github.com/itchyny/mmv/workflows/CI/badge.svg)](https://github.com/itchyny/mmv/actions) [![Go Report Card](https://goreportcard.com/badge/github.com/itchyny/mmv)](https://goreportcard.com/report/github.com/itchyny/mmv) -[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/itchyny/mmv/blob/master/LICENSE) +[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/itchyny/mmv/blob/main/LICENSE) [![release](https://img.shields.io/github/release/itchyny/mmv/all.svg)](https://github.com/itchyny/mmv/releases) [![pkg.go.dev](https://pkg.go.dev/badge/github.com/itchyny/mmv)](https://pkg.go.dev/github.com/itchyny/mmv)