Skip to content

Commit

Permalink
Prep for changing default branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
malfet committed Jul 28, 2021
1 parent cfb05c5 commit e67e1a5
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/clang-tidy-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clang-tidy-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lambda_github_status_webhook_handler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lambda_scribe_proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'aws/lambda/scribe-proxy/**'
push:
branches:
- master
- main
paths:
- '.github/workflows/lambda_scribe_proxy.yml'
- 'aws/lambda/scribe-proxy/**'
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/metrics_pytorch_org.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_disabled_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: '[email protected]'
user_name: 'Pytorch Test Infra'
commit_message: 'Updating disabled tests stats'
2 changes: 1 addition & 1 deletion .github/workflows/update_slow_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: '[email protected]'
user_name: 'PyTorch Test Infra'
commit_message: 'Updating slow tests stats'
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit e67e1a5

Please sign in to comment.