Skip to content

Commit

Permalink
Replacing refs to 'master' branch with 'main' (#318)
Browse files Browse the repository at this point in the history
  • Loading branch information
bocon13 committed Feb 11, 2021
1 parent c100e45 commit a1529ac
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-build-proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "build protobufs"

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
schedule:
- cron: "0 0 * * *"

Expand Down
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ deploy:
secure: O1tX0ymUh2sX3t+N0IYKbFasvAVsOxJZ3OyIi5M/6m5IHsDJUS3ldtHGVCAMD+dJEiSbcaxYdXfnxNlO8IFCH60eF4Q4STKmKn7jqjSRpAwf/97HPfI1M97RhMBFbqD0LM8nLQtAhQT5VVQQNcOl49LHZqMEDVtfA6Ta4noLXh32aawEq5DS+jI4iXBhk6CNfTTSs8GeSJmXIxJcoOmMkH6ibg3ZJ1mOV0F66IVqLyVoGhCgS4uwY9v7YmWJ4LRQDM3fycx08awlosFrzwOKrZp2fgTIzXAFd2ndL2OXzhCj+2p5Lp/LM6gIG/QQVHPnOPDs8ZxsKYOrycsPlJHs+3j+Wjy6a0RutZuLUXC2uHxuK/ZFQ+gJ1ExePzFRS83IESgG4swd9fGa9vBeWaP/RbS3KCc2LWLBsQf7MMIN+8tWLqul9k3yuUwaANOnE3Lt6bw6nKW5sef4ULqHkMO4ZH/S6a+TLeoKqDh59d4KpS/K2YPXediEBWk2Jk5bI5JHZDDFbde0Kls3cXOj3b6DTfMUQ4zcgDqVpyNKfOU764FnOGThVt9+zU6vIXRr6Y9olumgC24sz8IeEVEJv5234sdNd4E11B8tQE9JjoQDzmLgJ+xHNan0b1RgW/watYW2JFixwgYu2RLvHGMNySj9kw5t8Mj2Olj0FtsOq9MRHNE=
bucket: p4runtime
local-dir: docs/v1/build
upload-dir: docs/master
upload-dir: docs/main
acl: public_read
region: us-west-2
skip_cleanup: true
on:
repo: p4lang/p4runtime
branch: master
branch: main
- provider: s3
access_key_id: AKIAIT3MAUFCQEY7KAFQ
secret_access_key:
Expand All @@ -66,11 +66,11 @@ deploy:
repo: p4lang/p4runtime
tags: true
- provider: script
script: bash CI/deploy.sh master
script: bash CI/deploy.sh main
skip_cleanup: true
on:
repo: p4lang/p4runtime
branch: master
branch: main
- provider: pypi
username: "__token__"
password:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ Git tags are used to mark minor and patch release versions.
## Reading the latest version of the documentation

The latest version of the P4Runtime v1 specification is available:
* [here](https://p4.org/p4runtime/spec/master/P4Runtime-Spec.html) in **HTML**
* [here](https://p4.org/p4runtime/spec/main/P4Runtime-Spec.html) in **HTML**
format
* [here](https://p4.org/p4runtime/spec/master/P4Runtime-Spec.pdf) in **PDF**
* [here](https://p4.org/p4runtime/spec/main/P4Runtime-Spec.pdf) in **PDF**
format

It is updated every time a new commit is pushed to the master branch.
It is updated every time a new commit is pushed to the main branch.

## Overview

Expand Down
4 changes: 2 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ change the object's aspect ratio.)
## CI upload of built documents

Travis takes care of uploading the built HTML version of the spec to Github. The
latest working draft (master branch) can be found
[here](https://p4.org/p4runtime/spec/master/P4Runtime-Spec.html).
latest working draft (main branch) can be found
[here](https://p4.org/p4runtime/spec/main/P4Runtime-Spec.html).

Additionally, you can access the HTML & PDF versions of the spec for any given
branch of this repository by using the following URLs:
Expand Down
2 changes: 1 addition & 1 deletion docs/v1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ build you can invoke the make.bat script.
Following are major content items which are missing or incomplete:
* Section 17. P4Runtime Versioning
* Section 18. Extending P4Runtime for non-PSA architectures
* Section 19. Lifetime of a session
* Section 19. Lifetime of a session

0 comments on commit a1529ac

Please sign in to comment.