Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate references from master to main #200

Merged
merged 1 commit into from
Nov 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Coverage
on:
push:
branches:
- master
- main
pull_request:
schedule:
- cron: 0 0 * * *
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ They can also be run as a part of `tox` and they should be ran in a virtual envi

[issues]: https://github.com/dropbox/stone/issues
[pr]: https://github.com/dropbox/stone/pulls
[coc]: https://github.com/dropbox/stone/blob/master/CODE_OF_CONDUCT.md
[license]: https://github.com/dropbox/stone/blob/master/LICENSE
[coc]: https://github.com/dropbox/stone/blob/main/CODE_OF_CONDUCT.md
[license]: https://github.com/dropbox/stone/blob/main/LICENSE
[cla]: https://opensource.dropbox.com/cla/
24 changes: 12 additions & 12 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.. image:: https://img.shields.io/pypi/v/stone.svg
:target: https://pypi.python.org/pypi/stone

.. image:: https://codecov.io/gh/dropbox/stone/branch/master/graph/badge.svg
.. image:: https://codecov.io/gh/dropbox/stone/branch/main/graph/badge.svg
:target: https://codecov.io/gh/dropbox/stone

The Official Api Spec Language for Dropbox.
Expand Down Expand Up @@ -58,13 +58,13 @@ your choice.
* Introduction
* Motivation_
* Installation_
* `Language Reference <https://github.com/dropbox/stone/blob/master/docs/lang_ref.rst>`_
* `Builtin Backends <https://github.com/dropbox/stone/blob/master/docs/builtin_backends.rst>`_
* `Managing Specs <https://github.com/dropbox/stone/blob/master/docs/managing_specs.rst>`_
* `Evolving a Spec <https://github.com/dropbox/stone/blob/master/docs/evolve_spec.rst>`_
* `Backend Reference <https://github.com/dropbox/stone/blob/master/docs/backend_ref.rst>`_
* `JSON Serializer <https://github.com/dropbox/stone/blob/master/docs/json_serializer.rst>`_
* `Network Protocol <https://github.com/dropbox/stone/blob/master/docs/network_protocol.rst>`_
* `Language Reference <https://github.com/dropbox/stone/blob/main/docs/lang_ref.rst>`_
* `Builtin Backends <https://github.com/dropbox/stone/blob/main/docs/builtin_backends.rst>`_
* `Managing Specs <https://github.com/dropbox/stone/blob/main/docs/managing_specs.rst>`_
* `Evolving a Spec <https://github.com/dropbox/stone/blob/main/docs/evolve_spec.rst>`_
* `Backend Reference <https://github.com/dropbox/stone/blob/main/docs/backend_ref.rst>`_
* `JSON Serializer <https://github.com/dropbox/stone/blob/main/docs/json_serializer.rst>`_
* `Network Protocol <https://github.com/dropbox/stone/blob/main/docs/network_protocol.rst>`_

*Warning: The documentation is undergoing a rewrite.*

Expand Down Expand Up @@ -181,8 +181,8 @@ Stone is distributed under the MIT license, please see `LICENSE`_ for more infor

.. _logo: {logo_link}
.. _repo: https://github.com/dropbox/stone
.. _`Documentation`: https://github.com/dropbox/stone/tree/master/docs
.. _`Examples`: https://github.com/dropbox/stone/tree/master/example/backend
.. _LICENSE: https://github.com/dropbox/stone/blob/master/LICENSE
.. _CONTRIBUTING.md: https://github.com/dropbox/stone/blob/master/CONTRIBUTING.md
.. _`Documentation`: https://github.com/dropbox/stone/tree/main/docs
.. _`Examples`: https://github.com/dropbox/stone/tree/main/example/backend
.. _LICENSE: https://github.com/dropbox/stone/blob/main/LICENSE
.. _CONTRIBUTING.md: https://github.com/dropbox/stone/blob/main/CONTRIBUTING.md
.. _`Dropbox Support`: https://www.dropbox.com/developers/contact
2 changes: 1 addition & 1 deletion scripts/update_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ else
set -ex
NEW_VERSION=$1

git checkout master
git checkout main
git reset --hard HEAD

git tag "v${NEW_VERSION}" -m "${NEW_VERSION} release"
Expand Down