Change various references to the master branch to main

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2021-04-29 10:36:18 +10:00
parent 65c27713cf
commit 354df8bce9
7 changed files with 12 additions and 12 deletions

View file

@ -162,7 +162,7 @@ check-commit:
script:
- ci-fairy check-commits --signed-off-by --junit-xml=results.xml
except:
- master@libinput/libinput
- main@libinput/libinput
variables:
GIT_DEPTH: 100
artifacts:
@ -1081,6 +1081,6 @@ wayland-web:
MESON_BUILDDIR: 'builddir'
only:
refs:
- master
- main
variables:
- $CI_PROJECT_PATH == "libinput/libinput"

View file

@ -150,7 +150,7 @@ check-commit:
script:
- ci-fairy check-commits --signed-off-by --junit-xml=results.xml
except:
- master@libinput/libinput
- main@libinput/libinput
variables:
GIT_DEPTH: 100
artifacts:
@ -734,7 +734,7 @@ wayland-web:
MESON_BUILDDIR: 'builddir'
only:
refs:
- master
- main
variables:
- $CI_PROJECT_PATH == "libinput/libinput"

View file

@ -25,7 +25,7 @@ aparser.add_argument(
"--branch",
metavar="NAME",
help="Branch of the project being tested",
default="master",
default="main",
)
aparser.add_argument(
"--output",

View file

@ -31,4 +31,4 @@ This copy is provided to provide consistent behavior regardless which kernel
version libinput is compiled against. The header is used during compilation
only, libinput does not link against GPL libraries.
[1] https://gitlab.freedesktop.org/libinput/libinput/blob/master/include/linux/input.h
[1] https://gitlab.freedesktop.org/libinput/libinput/blob/main/include/linux/input.h

View file

@ -60,8 +60,8 @@ Examples of how to use libinput are the debugging tools in the libinput
repository. Developers are encouraged to look at those tools for a
real-world (yet simple) example on how to use libinput.
- A commandline debugging tool: https://gitlab.freedesktop.org/libinput/libinput/tree/master/tools/libinput-debug-events.c
- A GTK application that draws cursor/touch/tablet positions: https://gitlab.freedesktop.org/libinput/libinput/tree/master/tools/libinput-debug-gui.c
- A commandline debugging tool: https://gitlab.freedesktop.org/libinput/libinput/tree/main/tools/libinput-debug-events.c
- A GTK application that draws cursor/touch/tablet positions: https://gitlab.freedesktop.org/libinput/libinput/tree/main/tools/libinput-debug-gui.c
License
-------
@ -75,7 +75,7 @@ libinput is licensed under the MIT license.
> and/or sell copies of the Software, and to permit persons to whom the
> Software is furnished to do so, subject to the following conditions: [...]
See the [COPYING](https://gitlab.freedesktop.org/libinput/libinput/tree/master/COPYING)
See the [COPYING](https://gitlab.freedesktop.org/libinput/libinput/tree/main/COPYING)
file for the full license information.
About

View file

@ -190,7 +190,7 @@ libinput has a few build-time dependencies that must be installed prior to
running meson.
.. hint:: The build dependencies for some distributions can be found in the
`GitLab Continuous Integration file <https://gitlab.freedesktop.org/libinput/libinput/blob/master/.gitlab-ci.yml>`_.
`GitLab Continuous Integration file <https://gitlab.freedesktop.org/libinput/libinput/blob/main/.gitlab-ci.yml>`_.
Search for **FEDORA_RPMS** in the **variables:** definition
and check the list for an entry for your distribution.

View file

@ -189,7 +189,7 @@ sufficient to make some of the more confusing steps obvious.
https://gitlab.freedesktop.org/USERNAME/libinput/merge_requests
Select your branch name to merge and ``libinput/libinput`` ``master`` as target branch.
Select your branch name to merge and ``libinput/libinput`` ``main`` as target branch.
- Verify that the CI completes successfully by visiting the merge request
page. A successful pipeline shows only green ticks, failure is indicated
@ -299,7 +299,7 @@ Coding Style
------------------------------------------------------------------------------
Please see the `CODING_STYLE.md
<https://gitlab.freedesktop.org/libinput/libinput/blob/master/CODING_STYLE.md>`_
<https://gitlab.freedesktop.org/libinput/libinput/blob/main/CODING_STYLE.md>`_
document in the source tree.
------------------------------------------------------------------------------