Rename the development branch from master to main

Fixes https://github.com/fwupd/fwupd/issues/3799
This commit is contained in:
Richard Hughes 2021-09-24 19:22:48 +01:00 committed by Mario Limonciello
parent 204da7a775
commit 7f5b0c0b60
10 changed files with 12 additions and 12 deletions

View File

@ -158,7 +158,7 @@ workflows:
- build-snap - build-snap
filters: filters:
branches: branches:
only: master only: main
deploy: deploy:
jobs: jobs:
- build-ubuntu-x86_64: - build-ubuntu-x86_64:

View File

@ -1,9 +1,9 @@
name: Continuous Integration name: Continuous Integration
on: on:
push: push:
branches: [ master ] branches: [ main ]
pull_request: pull_request:
branches: [ master ] branches: [ main ]
jobs: jobs:
pre-commit: pre-commit:

View File

@ -3,7 +3,7 @@ repos:
rev: v4.0.1 rev: v4.0.1
hooks: hooks:
- id: no-commit-to-branch - id: no-commit-to-branch
args: [--branch, master, --pattern, 1_.*_X] args: [--branch, main, --pattern, 1_.*_X]
- id: check-added-large-files - id: check-added-large-files
- id: check-byte-order-marker - id: check-byte-order-marker
- id: check-executables-have-shebangs - id: check-executables-have-shebangs

View File

@ -1,7 +1,7 @@
[main] [main]
host = https://www.transifex.com host = https://www.transifex.com
[fwupd.master] [fwupd.main]
file_filter = po/<lang>.po file_filter = po/<lang>.po
source_file = po/fwupd.pot source_file = po/fwupd.pot
source_lang = en source_lang = en

View File

@ -3,7 +3,7 @@
[![Build Status](https://github.com/fwupd/fwupd/actions/workflows/main.yml/badge.svg)](https://github.com/fwupd/fwupd/actions/workflows/main.yml) [![Build Status](https://github.com/fwupd/fwupd/actions/workflows/main.yml/badge.svg)](https://github.com/fwupd/fwupd/actions/workflows/main.yml)
[![Coverity Scan Build Status](https://scan.coverity.com/projects/10744/badge.svg)](https://scan.coverity.com/projects/10744) [![Coverity Scan Build Status](https://scan.coverity.com/projects/10744/badge.svg)](https://scan.coverity.com/projects/10744)
[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/fwupd.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:fwupd) [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/fwupd.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:fwupd)
[![CircleCI](https://circleci.com/gh/fwupd/fwupd/tree/master.svg?style=svg)](https://circleci.com/gh/fwupd/fwupd/tree/master) [![CircleCI](https://circleci.com/gh/fwupd/fwupd/tree/main.svg?style=svg)](https://circleci.com/gh/fwupd/fwupd/tree/main)
This project aims to make updating firmware on Linux automatic, safe and reliable. This project aims to make updating firmware on Linux automatic, safe and reliable.

View File

@ -2,7 +2,7 @@ fwupd Release Notes
Forking stable branch: Forking stable branch:
When forking master into a stable 1_7_X, be sure to disable the following CI jobs: When forking main into a stable 1_7_X, be sure to disable the following CI jobs:
* publish-docs * publish-docs
* publish-stable * publish-stable

View File

@ -24,8 +24,8 @@ def prepare(target):
sdk = "runtime/%s/x86_64/%s" % (data["sdk"], data["runtime-version"]) sdk = "runtime/%s/x86_64/%s" % (data["sdk"], data["runtime-version"])
num_modules = len(data["modules"]) num_modules = len(data["modules"])
# update to build from master # update to build from main
data["branch"] = "master" data["branch"] = "main"
for index in range(0, num_modules): for index in range(0, num_modules):
module = data["modules"][index] module = data["modules"][index]
if type(module) != dict or not "name" in module: if type(module) != dict or not "name" in module:

View File

@ -55,7 +55,7 @@ Other variables, include:
## File system overrides ## File system overrides
These are not fully documented here, see <https://github.com/fwupd/fwupd/blob/master/libfwupdplugin/fu-common.c> These are not fully documented here, see <https://github.com/fwupd/fwupd/blob/main/libfwupdplugin/fu-common.c>
for details. for details.
* `CACHE_DIRECTORY` * `CACHE_DIRECTORY`

View File

@ -95,7 +95,7 @@ A runtime security issue detected.
- Unencrypted [swap partition](https://wiki.archlinux.org/index.php/Dm-crypt/Swap_encryption). *[v1.5.0]* - Unencrypted [swap partition](https://wiki.archlinux.org/index.php/Dm-crypt/Swap_encryption). *[v1.5.0]*
- The installed fwupd is running with [custom or modified plugins](https://github.com/fwupd/fwupd/tree/master/plugins). *[v1.5.0]* - The installed fwupd is running with [custom or modified plugins](https://github.com/fwupd/fwupd/tree/main/plugins). *[v1.5.0]*
## Tests included in fwupd {#tests} ## Tests included in fwupd {#tests}

View File

@ -23,6 +23,6 @@ This includes things like one plugin turning on a device, or providing missing
metadata to another plugin. metadata to another plugin.
The ABI for these interactions is defined in: The ABI for these interactions is defined in:
<https://github.com/fwupd/fwupd/blob/master/libfwupdplugin/fu-device-metadata.h> <https://github.com/fwupd/fwupd/blob/main/libfwupdplugin/fu-device-metadata.h>
All interactions between plugins should have the interface defined in that file. All interactions between plugins should have the interface defined in that file.