diff --git a/.github/workflows/clang-tidy-linux.yml b/.github/workflows/clang-tidy-linux.yml index b507918abb..f2868a6125 100644 --- a/.github/workflows/clang-tidy-linux.yml +++ b/.github/workflows/clang-tidy-linux.yml @@ -8,7 +8,7 @@ on: - '.github/workflows/clang-tidy-linux.yml' push: branches: - - master + - main paths: - 'tools/clang-tidy-checks/**' - '!tools/clang-tidy-checks/README.md' @@ -26,7 +26,7 @@ jobs: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin docker build ./tools/clang-tidy-checks --tag ghcr.io/pytorch/cilint-clang-tidy:$GITHUB_SHA -f tools/clang-tidy-checks/Dockerfile.cilint-clang-tidy - name: Publish docker image and extract binary - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: github.event_name == 'push' && github.ref == 'refs/heads/main' run: | set -ex docker push ghcr.io/pytorch/cilint-clang-tidy:$GITHUB_SHA @@ -38,7 +38,7 @@ jobs: docker rm -v $image_id - uses: driazati/upload-artifact-s3@50adbe4ef0b6d9221df25c18c5fc528dfcb7c3f8 name: Publish binary - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: github.event_name == 'push' && github.ref == 'refs/heads/main' with: name: clang-tidy if-no-files-found: error diff --git a/.github/workflows/clang-tidy-macos.yml b/.github/workflows/clang-tidy-macos.yml index 065d618c79..e3399e4409 100644 --- a/.github/workflows/clang-tidy-macos.yml +++ b/.github/workflows/clang-tidy-macos.yml @@ -9,7 +9,7 @@ on: - '.github/workflows/clang-tidy-macos.yml' push: branches: - - master + - main paths: - 'tools/clang-tidy-checks/**' - '!tools/clang-tidy-checks/Dockerfile.cilint-clang-tidy' @@ -37,7 +37,7 @@ jobs: ./setup.sh - uses: driazati/upload-artifact-s3@50adbe4ef0b6d9221df25c18c5fc528dfcb7c3f8 name: Publish binary - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: github.event_name == 'push' && github.ref == 'refs/heads/main' with: name: clang-tidy if-no-files-found: error diff --git a/.github/workflows/lambda_github_status_webhook_handler.yml b/.github/workflows/lambda_github_status_webhook_handler.yml index 73ac84fd54..aed95652b9 100644 --- a/.github/workflows/lambda_github_status_webhook_handler.yml +++ b/.github/workflows/lambda_github_status_webhook_handler.yml @@ -3,7 +3,7 @@ name: lambda_github_status_webhook_handler on: push: branches: - - master + - main paths: - '.github/workflows/lambda_github_status_webhook_handler.yml' - 'aws/lambda/github-status-webhook-handler/**' diff --git a/.github/workflows/lambda_scribe_proxy.yml b/.github/workflows/lambda_scribe_proxy.yml index 719b765462..01b0751657 100644 --- a/.github/workflows/lambda_scribe_proxy.yml +++ b/.github/workflows/lambda_scribe_proxy.yml @@ -6,7 +6,7 @@ on: - 'aws/lambda/scribe-proxy/**' push: branches: - - master + - main paths: - '.github/workflows/lambda_scribe_proxy.yml' - 'aws/lambda/scribe-proxy/**' @@ -26,7 +26,7 @@ jobs: python -m unittest deploy: runs-on: ubuntu-20.04 - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: github.event_name == 'push' && github.ref == 'refs/heads/main' steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/metrics_pytorch_org.yml b/.github/workflows/metrics_pytorch_org.yml index 85b96ec251..393ebf6c3f 100644 --- a/.github/workflows/metrics_pytorch_org.yml +++ b/.github/workflows/metrics_pytorch_org.yml @@ -3,7 +3,7 @@ name: Deploy metrics.pytorch.org on: push: branches: - - master + - main paths: - 'aws/websites/metrics.pytorch.org/**' - '.github/workflows/metrics_pytorch_org.yml' diff --git a/.github/workflows/update_disabled_tests.yml b/.github/workflows/update_disabled_tests.yml index 81a23820eb..2eeaac85cc 100644 --- a/.github/workflows/update_disabled_tests.yml +++ b/.github/workflows/update_disabled_tests.yml @@ -24,7 +24,7 @@ jobs: source_file: 'disabled-tests.json' destination_repo: 'pytorch/test-infra' destination_folder: 'stats' - destination_branch: master + destination_branch: main user_email: 'test-infra@pytorch.org' user_name: 'Pytorch Test Infra' commit_message: 'Updating disabled tests stats' diff --git a/.github/workflows/update_slow_tests.yml b/.github/workflows/update_slow_tests.yml index 481a81235a..e52f755fbc 100644 --- a/.github/workflows/update_slow_tests.yml +++ b/.github/workflows/update_slow_tests.yml @@ -39,7 +39,7 @@ jobs: source_file: 'slow-tests.json' destination_repo: 'pytorch/test-infra' destination_folder: 'stats' - destination_branch: master + destination_branch: main user_email: 'test-infra@pytorch.org' user_name: 'PyTorch Test Infra' commit_message: 'Updating slow tests stats' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 21df951797..6b21e7cdb7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ The code of conduct is described in [`CODE_OF_CONDUCT.md`](CODE_OF_CONDUCT.md). We actively welcome your pull requests. -1. Fork the repo and create your branch from `master`. +1. Fork the repo and create your branch from `main`. 2. If you've added code that should be tested, add tests. 3. If you've changed APIs, update the documentation. 4. Ensure the test suite passes.