diff --git a/.github/mergify.yml b/.github/mergify.yml index fa69eeb93..15111df3a 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,7 +1,7 @@ pull_request_rules: - name: backport patches to 1.11 conditions: - - base=master + - base=main - label=backport-1.11 actions: backport: diff --git a/.github/workflows/packages.yaml b/.github/workflows/packages.yaml index 90c84ec04..21de55a0b 100644 --- a/.github/workflows/packages.yaml +++ b/.github/workflows/packages.yaml @@ -2,7 +2,7 @@ name: Build packages on: push: branches: - - master + - main release: types: [released, prereleased] workflow_dispatch: diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 527202929..09ce22c60 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -83,7 +83,7 @@ jobs: file: ./coverage.xml fail_ci_if_error: false notify: - if: github.ref == 'refs/heads/master' && failure() + if: github.ref == 'refs/heads/main' && failure() needs: - lint - tests @@ -94,6 +94,6 @@ jobs: env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} SLACK_COLOR: ${{ job.status }} - SLACK_MESSAGE: 'CI Failed on master :boom:' + SLACK_MESSAGE: 'CI Failed on main :boom:' SLACK_TITLE: CI Status SLACK_USERNAME: DVC-CI diff --git a/README.rst b/README.rst index a50b56029..d7db5a33d 100644 --- a/README.rst +++ b/README.rst @@ -103,7 +103,7 @@ Snap (Snapcraft/Linux) This corresponds to the latest tagged release. Add ``--beta`` for the latest tagged release candidate, -or ``--edge`` for the latest ``master`` version. +or ``--edge`` for the latest ``main`` version. Choco (Chocolatey/Windows) -------------------------- @@ -254,7 +254,7 @@ Barrak, A., Eghan, E.E. and Adams, B. `On the Co-evolution of ML Pipelines and S :target: https://dvc.org :alt: DVC logo -.. |CI| image:: https://github.com/iterative/dvc/workflows/Tests/badge.svg?branch=master +.. |CI| image:: https://github.com/iterative/dvc/workflows/Tests/badge.svg?branch=main :target: https://github.com/iterative/dvc/actions :alt: GHA Tests @@ -262,7 +262,7 @@ Barrak, A., Eghan, E.E. and Adams, B. `On the Co-evolution of ML Pipelines and S :target: https://codeclimate.com/github/iterative/dvc :alt: Code Climate -.. |Coverage| image:: https://codecov.io/gh/iterative/dvc/branch/master/graph/badge.svg +.. |Coverage| image:: https://codecov.io/gh/iterative/dvc/branch/main/graph/badge.svg :target: https://codecov.io/gh/iterative/dvc :alt: Codecov