diff --git a/.circleci/config.yml b/.circleci/config.yml index 87d4b167f..f849bb018 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -158,7 +158,7 @@ workflows: - build-snap filters: branches: - only: master + only: main deploy: jobs: - build-ubuntu-x86_64: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 983fa0468..a6b2c1397 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,9 +1,9 @@ name: Continuous Integration on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: pre-commit: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0c574614b..5d6f57cfa 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ repos: rev: v4.0.1 hooks: - id: no-commit-to-branch - args: [--branch, master, --pattern, 1_.*_X] + args: [--branch, main, --pattern, 1_.*_X] - id: check-added-large-files - id: check-byte-order-marker - id: check-executables-have-shebangs diff --git a/.tx/config b/.tx/config index ff60389de..ff5e554ac 100644 --- a/.tx/config +++ b/.tx/config @@ -1,7 +1,7 @@ [main] host = https://www.transifex.com -[fwupd.master] +[fwupd.main] file_filter = po/.po source_file = po/fwupd.pot source_lang = en diff --git a/README.md b/README.md index 8692e6fce..447cdbc11 100644 --- a/README.md +++ b/README.md @@ -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) [![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) -[![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. diff --git a/RELEASE b/RELEASE index ffe09a282..89df5b965 100644 --- a/RELEASE +++ b/RELEASE @@ -2,7 +2,7 @@ fwupd Release Notes 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-stable diff --git a/contrib/ci/flatpak.py b/contrib/ci/flatpak.py index 162b6e96b..28c3ce0d8 100755 --- a/contrib/ci/flatpak.py +++ b/contrib/ci/flatpak.py @@ -24,8 +24,8 @@ def prepare(target): sdk = "runtime/%s/x86_64/%s" % (data["sdk"], data["runtime-version"]) num_modules = len(data["modules"]) - # update to build from master - data["branch"] = "master" + # update to build from main + data["branch"] = "main" for index in range(0, num_modules): module = data["modules"][index] if type(module) != dict or not "name" in module: diff --git a/docs/env.md b/docs/env.md index 6d96df703..b85d9d832 100644 --- a/docs/env.md +++ b/docs/env.md @@ -55,7 +55,7 @@ Other variables, include: ## File system overrides -These are not fully documented here, see +These are not fully documented here, see for details. * `CACHE_DIRECTORY` diff --git a/docs/hsi.md b/docs/hsi.md index 4222e098e..df286cc8c 100644 --- a/docs/hsi.md +++ b/docs/hsi.md @@ -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]* -- 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} diff --git a/plugins/README.md b/plugins/README.md index d2a54490d..3279a01a1 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -23,6 +23,6 @@ This includes things like one plugin turning on a device, or providing missing metadata to another plugin. The ABI for these interactions is defined in: - + All interactions between plugins should have the interface defined in that file.