Skip to content

Commit

Permalink
Merge pull request #288 from mavlink/pr-main
Browse files Browse the repository at this point in the history
Switch from master to main branch
  • Loading branch information
JonasVautherin authored Nov 24, 2020
2 parents 2de2310 + cdc1a4f commit 27a7e60
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: PyPi Upload
on:
push:
branches:
- 'master'
- 'main'
tags:
- '*'
pull_request:
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MAVSDK-Python

[![GitHub Actions Status](https://github.com/mavlink/MAVSDK-Python/workflows/PyPi%20Upload/badge.svg?branch=master)](https://github.com/mavlink/MAVSDK-Python/actions?query=branch%3Amaster)
[![GitHub Actions Status](https://github.com/mavlink/MAVSDK-Python/workflows/PyPi%20Upload/badge.svg?branch=main)](https://github.com/mavlink/MAVSDK-Python/actions?query=branch%3Amain)

This is the Python wrapper for MAVSDK.

Expand Down Expand Up @@ -117,11 +117,11 @@ make -C mavsdk html

### Release steps

1. Check all required pull requests are merged to master
1. Check all required pull requests are merged to main
2. Check [MAVSDK_SERVER_VERSION](MAVSDK_SERVER_VERSION) is set to the correct version of mavsdk_server.
3. Create git tag on laster master, e.g.:
3. Create git tag on laster main, e.g.:
```
git switch master
git switch main
git pull
git tag X.Y.Z
git push --tags
Expand Down
2 changes: 1 addition & 1 deletion mavsdk/source/index.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. MAVSDK-Python documentation master file, created by
.. MAVSDK-Python documentation main file, created by
sphinx-quickstart on Sat May 30 10:40:26 2020.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Expand Down
2 changes: 1 addition & 1 deletion other/templates/py/file.j2
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# DO NOT EDIT! This file is auto-generated from
# https://github.com/mavlink/MAVSDK-Python/tree/master/other/templates/py
# https://github.com/mavlink/MAVSDK-Python/tree/main/other/templates/py
from ._base import AsyncBase
from . import {{ plugin_name.lower_snake_case }}_pb2, {{ plugin_name.lower_snake_case }}_pb2_grpc
from enum import Enum
Expand Down

0 comments on commit 27a7e60

Please sign in to comment.