diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68b54b2..9d0abae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: pull_request: push: branches: - - master + - main jobs: @@ -19,17 +19,17 @@ jobs: platform: [ubuntu-22.04] runs-on: ${{ matrix.platform }} steps: - # checkout master branch and the current branch so that we are able to do diff operations. - - name: checkout master branch too. + # checkout main branch and the current branch so that we are able to do diff operations. + - name: checkout main branch too. uses: actions/checkout@v4 with: - ref: master + ref: main - name: Check out code uses: actions/checkout@v4 # https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions - name: check if changes have release notes - if: ${{ github.ref != 'refs/heads/master' }} + if: ${{ github.ref != 'refs/heads/main' }} env: GIT_BRANCH: ${{ github.ref }} GITHUB_HEAD_REF: ${{ github.head_ref }} @@ -40,14 +40,14 @@ jobs: printf "GITHUB_BASE_REF: $GITHUB_BASE_REF \n" printf "list git branches: \n" git branch --list --all - if [[ "$GIT_BRANCH" == "refs/heads/master" ]] + if [[ "$GIT_BRANCH" == "refs/heads/main" ]] then printf "\n $GIT_BRANCH branch, ignoring check for relese notes \n" elif [[ "$GIT_BRANCH" == *"refs/tags/"* ]] then printf "\n $GIT_BRANCH branch, ignoring check for relese notes \n" else - ChangedFiles=`git diff --name-only remotes/origin/master` + ChangedFiles=`git diff --name-only remotes/origin/main` echo $ChangedFiles case "$ChangedFiles" in *CHANGELOG.*) diff --git a/Makefile b/Makefile index a12a222..bbda8d9 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ uploadprod: @python setup.py bdist_wheel @twine upload dist/* @printf "\n creating git tag: $(VERSION_STRING) \n" - @printf "\n with commit message, see Changelong: https://github.com/komuw/wiji/blob/master/CHANGELOG.md \n" && git tag -a "$(VERSION_STRING)" -m "see Changelong: https://github.com/komuw/wiji/blob/master/CHANGELOG.md" + @printf "\n with commit message, see Changelong: https://github.com/komuw/wiji/blob/main/CHANGELOG.md \n" && git tag -a "$(VERSION_STRING)" -m "see Changelong: https://github.com/komuw/wiji/blob/main/CHANGELOG.md" @printf "\n git push the tag::\n" && git push --all -u --follow-tags @pip install -U wiji diff --git a/README.md b/README.md index 7b29c74..f795750 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Codacy Badge](https://api.codacy.com/project/badge/Grade/f0b4b7a07da24e90bdb7743d0e6b9240)](https://www.codacy.com/app/komuw/wiji) [![CircleCI](https://circleci.com/gh/komuw/wiji.svg?style=svg)](https://circleci.com/gh/komuw/wiji) -[![codecov](https://codecov.io/gh/komuw/wiji/branch/master/graph/badge.svg)](https://codecov.io/gh/komuw/wiji) +[![codecov](https://codecov.io/gh/komuw/wiji/branch/main/graph/badge.svg)](https://codecov.io/gh/komuw/wiji) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/komuw/wiji) diff --git a/documentation/sphinx-docs/conf.py b/documentation/sphinx-docs/conf.py index f2f3bd7..d401ee8 100644 --- a/documentation/sphinx-docs/conf.py +++ b/documentation/sphinx-docs/conf.py @@ -101,7 +101,7 @@ "description": "wiji is an async blah blash.", "github_banner": False, "travis_button": False, # see: https://github.com/bitprophet/alabaster/pull/147 - "badge_branch": "master", + "badge_branch": "main", "codecov_button": True, "show_related": True, "github_user": "komuw",