diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2021-04-29 10:36:18 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-04-29 01:31:03 +0000 |
commit | 354df8bce9874e92de2ad8535fdcedaec0755b27 (patch) | |
tree | cca5a83a699bc3eb9f7916391d07e68d033548c8 | |
parent | 65c27713cf1b7e73ffede283e836aa5332849d7d (diff) | |
download | libinput-354df8bce9874e92de2ad8535fdcedaec0755b27.tar.gz |
Change various references to the master branch to main
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r-- | .gitlab-ci.yml | 4 | ||||
-rw-r--r-- | .gitlab-ci/ci.template | 4 | ||||
-rwxr-xr-x | .gitlab-ci/meson-junit-report.py | 2 | ||||
-rw-r--r-- | COPYING | 2 | ||||
-rw-r--r-- | README.md | 6 | ||||
-rw-r--r-- | doc/user/building.rst | 2 | ||||
-rw-r--r-- | doc/user/contributing.rst | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 209dc004..178a6348 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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" diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index a02e690b..b51e5c14 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -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" diff --git a/.gitlab-ci/meson-junit-report.py b/.gitlab-ci/meson-junit-report.py index aad52f4f..ec7f3178 100755 --- a/.gitlab-ci/meson-junit-report.py +++ b/.gitlab-ci/meson-junit-report.py @@ -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", @@ -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 @@ -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 diff --git a/doc/user/building.rst b/doc/user/building.rst index c5cca454..1aff1a8a 100644 --- a/doc/user/building.rst +++ b/doc/user/building.rst @@ -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. diff --git a/doc/user/contributing.rst b/doc/user/contributing.rst index 0c4a5c0d..dc217969 100644 --- a/doc/user/contributing.rst +++ b/doc/user/contributing.rst @@ -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. ------------------------------------------------------------------------------ |