Skip to content

Commit 27a7e60

Browse files
Merge pull request #288 from mavlink/pr-main
Switch from master to main branch
2 parents 2de2310 + cdc1a4f commit 27a7e60

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: PyPi Upload
33
on:
44
push:
55
branches:
6-
- 'master'
6+
- 'main'
77
tags:
88
- '*'
99
pull_request:

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MAVSDK-Python
22

3-
[![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)
3+
[![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)
44

55
This is the Python wrapper for MAVSDK.
66

@@ -117,11 +117,11 @@ make -C mavsdk html
117117

118118
### Release steps
119119

120-
1. Check all required pull requests are merged to master
120+
1. Check all required pull requests are merged to main
121121
2. Check [MAVSDK_SERVER_VERSION](MAVSDK_SERVER_VERSION) is set to the correct version of mavsdk_server.
122-
3. Create git tag on laster master, e.g.:
122+
3. Create git tag on laster main, e.g.:
123123
```
124-
git switch master
124+
git switch main
125125
git pull
126126
git tag X.Y.Z
127127
git push --tags

mavsdk/source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. MAVSDK-Python documentation master file, created by
1+
.. MAVSDK-Python documentation main file, created by
22
sphinx-quickstart on Sat May 30 10:40:26 2020.
33
You can adapt this file completely to your liking, but it should at least
44
contain the root `toctree` directive.

other/templates/py/file.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22
# DO NOT EDIT! This file is auto-generated from
3-
# https://github.com/mavlink/MAVSDK-Python/tree/master/other/templates/py
3+
# https://github.com/mavlink/MAVSDK-Python/tree/main/other/templates/py
44
from ._base import AsyncBase
55
from . import {{ plugin_name.lower_snake_case }}_pb2, {{ plugin_name.lower_snake_case }}_pb2_grpc
66
from enum import Enum

0 commit comments

Comments
 (0)