Skip to content

Commit fab6639

Browse files
authoredJun 14, 2024··
treewide: Update main branch name (#3282)
Following the rename of master to main, update everything that references the branch.
1 parent 10728bc commit fab6639

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed
 

‎.github/workflows/build-container.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Create and publish a Docker image
44
on:
55
push:
66
branches:
7-
- 'master'
7+
- 'main'
88
- 'next'
99
- 'v202[0-9].[0-9].x'
1010
tags:

‎.github/workflows/build-gluon.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build Gluon
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66
- next
77
- 'v20[2-9][0-9].[0-9].x'
88
pull_request:

‎.github/workflows/bump-gluon.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branch:
88
description: "Branch to create update for"
99
required: true
10-
default: "master"
10+
default: "main"
1111

1212
jobs:
1313
update-openwrt:

‎CONTRIBUTING.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ discuss there. We maintain a [list of rejected features] and we'd like to
2929
kindly ask you to review it first. In general, looking for duplicates may save
3030
you some time.
3131

32-
Develop on top of master
33-
------------------------
32+
Develop on top of main
33+
----------------------
3434
If you are not developing something specific to a release (like for example a
3535
security fix to a feature that got completely rewritten since the release),
36-
develop it on top of the master branch. New features and even feature changes
36+
develop it on top of the main branch. New features and even feature changes
3737
aren't usually backported to old releases, but will be included in the upcoming
38-
release, which will be built from master.
38+
release, which will be built from main.
3939

4040
Use descriptive commit messages
4141
-------------------------------

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Gluon](https://github.com/freifunk-gluon/gluon/actions/workflows/build-gluon.yml/badge.svg?branch=master)](https://github.com/freifunk-gluon/gluon/actions/workflows/build-gluon.yml)
1+
[![Build Gluon](https://github.com/freifunk-gluon/gluon/actions/workflows/build-gluon.yml/badge.svg?branch=main)](https://github.com/freifunk-gluon/gluon/actions/workflows/build-gluon.yml)
22
[![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://opensource.org/license/bsd-2-clause/)
33
[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/freifunk-gluon/gluon?sort=semver)](https://github.com/freifunk-gluon/gluon/releases/latest)
44

@@ -57,12 +57,12 @@ the future development of Gluon.
5757

5858
## Use a release!
5959

60-
Please refrain from using the `master` branch for anything else but development purposes!
60+
Please refrain from using the `main` branch for anything else but development purposes!
6161
Use the most recent release instead. You can list all releases by running `git tag`
6262
and switch to one by running `git checkout v2023.2.2 && make update`.
6363

6464
If you're using the autoupdater, do not autoupdate nodes with anything but releases.
65-
If you upgrade using random master commits the nodes *might break* eventually.
65+
If you upgrade using random main commits the nodes *might break* eventually.
6666

6767
## Mailinglist
6868

‎docs/features/monitoring.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,5 +135,5 @@ Adding a data provider
135135
----------------------
136136

137137
To add a provider, you need to install a shared object into ``/lib/gluon/respondd``.
138-
For more information, refer to the `respondd README <https://github.com/freifunk-gluon/packages/blob/master/net/respondd/README.md>`_
138+
For more information, refer to the `respondd README <https://github.com/freifunk-gluon/packages/blob/main/net/respondd/README.md>`_
139139
and have a look the existing providers.

‎docs/features/vpn.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ gateway, tries to establish a connection, and if it fails, tries to connect
167167
to the next gateway. This approach has several advantages, such as load
168168
balancing VPN connection attempts and avoiding problems with offline gateways.
169169
More information about the wgpeerselector and its algorithm can be found
170-
`here <https://github.com/freifunk-gluon/packages/blob/master/net/wgpeerselector/README.md>`__.
170+
`here <https://github.com/freifunk-gluon/packages/blob/main/net/wgpeerselector/README.md>`__.
171171

172172
On the gluon node both VXLAN and the wgpeerselector are well integrated and no
173173
explicit configuration of those tools is necessary, once the general WireGuard

‎docs/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ License
8686

8787
See LICENCE_
8888

89-
.. _LICENCE: https://github.com/freifunk-gluon/gluon/blob/master/LICENSE
89+
.. _LICENCE: https://github.com/freifunk-gluon/gluon/blob/main/LICENSE
9090

9191
Indices and tables
9292
==================

‎docs/user/site.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ PACKAGES_${feed}_COMMIT
809809

810810
PACKAGES_${feed}_BRANCH
811811
Optional: The branch of the repository the given commit ID can be found in.
812-
Defaults to the default branch of the repository (usually ``master``)
812+
Defaults to the default branch of the repository (usually ``main`` or ``master``)
813813

814814
These variables are always all uppercase, so for an entry ``foo`` in GLUON_SITE_FEEDS,
815815
the corresponding configuration variables would be ``PACKAGES_FOO_REPO``,

0 commit comments

Comments
 (0)
Please sign in to comment.