From 95de194f5966d46b3a84b1bf0fc00853c2f6d3aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 7 May 2021 16:12:45 +0200 Subject: [PATCH] *: rename master branch to main --- .cci.jenkinsfile | 2 +- .github/workflows/rust-lints.yml | 4 ++-- README.md | 2 +- ci/ci-commitmessage-submodules.sh | 2 +- docs/CONTRIBUTING.md | 2 +- docs/HACKING.md | 4 ++-- docs/RELEASE.md | 4 ++-- docs/_config.yml | 2 +- docs/architecture-daemon.md | 8 ++++---- docs/index.md | 2 +- docs/repo_structure.md | 2 +- packaging/rpm-ostree.spec.in | 2 +- tests/vmcheck/install.sh | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile index d5d389e9..1a760710 100644 --- a/.cci.jenkinsfile +++ b/.cci.jenkinsfile @@ -19,7 +19,7 @@ codestyle: { checkout scm shwrap(""" # Ensures that we get refs to aid `git describe` - git fetch origin +refs/heads/master:refs/remotes/origin/master + git fetch origin +refs/heads/main:refs/remotes/origin/main ci/commit-validation.sh """) } diff --git a/.github/workflows/rust-lints.yml b/.github/workflows/rust-lints.yml index 896beb2a..a7855490 100644 --- a/.github/workflows/rust-lints.yml +++ b/.github/workflows/rust-lints.yml @@ -2,9 +2,9 @@ name: Rust on: push: - branches: [master] + branches: [main] pull_request: - branches: [master] + branches: [main] env: CARGO_TERM_COLOR: always diff --git a/README.md b/README.md index 14347fce..c9b856bf 100644 --- a/README.md +++ b/README.md @@ -44,4 +44,4 @@ For more information, see the [project documentation](docs/index.md) or the ## License rpm-ostree includes code licensed under GPLv2+, LGPLv2+, (Apache 2.0 OR MIT). -For more information, see [LICENSE](https://github.com/coreos/rpm-ostree/blob/master/LICENSE). +For more information, see [LICENSE](https://github.com/coreos/rpm-ostree/blob/main/LICENSE). diff --git a/ci/ci-commitmessage-submodules.sh b/ci/ci-commitmessage-submodules.sh index 482daf94..58c225fc 100755 --- a/ci/ci-commitmessage-submodules.sh +++ b/ci/ci-commitmessage-submodules.sh @@ -39,7 +39,7 @@ gitdir=$(realpath $(pwd)) # require a newer git, we could use `git worktree`. cp -a ${gitdir} ${tmpd}/workdir cd ${tmpd}/workdir -git log --pretty=oneline origin/master..$HEAD | while read logline; do +git log --pretty=oneline origin/main..$HEAD | while read logline; do commit=$(echo ${logline} | cut -f 1 -d ' ') # For merge commits, just check that they're empty (i.e. no conflict # resolution was needed). Otherwise, let's just error out. Conflicts should diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index f306d0a2..a1746da5 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -24,5 +24,5 @@ There is `make check` as well as `make vmcheck`. See also what the See the [OSTree CONTRIBUTING][contributing] coding style. [rpm-ostree]: https://github.com/coreos/rpm-ostree -[jenkinsfile]: https://github.com/coreos/rpm-ostree/blob/master/.cci.jenkinsfile +[jenkinsfile]: https://github.com/coreos/rpm-ostree/blob/main/.cci.jenkinsfile [contributing]: https://github.com/ostreedev/ostree/blob/master/docs/CONTRIBUTING.md diff --git a/docs/HACKING.md b/docs/HACKING.md index 0a8dbe9a..64f8b952 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -110,7 +110,7 @@ So just do e.g.: ``` cd libdnf git fetch origin -git reset --hard origin/master +git reset --hard origin/main cd .. ``` @@ -119,7 +119,7 @@ The various `make` targets will pick up the changes and recompile. ## Testing with a custom ostree It is sometimes necessary to develop against a version of ostree which is not -even yet in git master. In such situations, one can simply do: +even yet in git main. In such situations, one can simply do: ```sh $ # from the rpm-ostree build dir diff --git a/docs/RELEASE.md b/docs/RELEASE.md index 01c93f7a..a0de74f4 100644 --- a/docs/RELEASE.md +++ b/docs/RELEASE.md @@ -9,8 +9,8 @@ nav_order: 8 3. Verify the libdnf deps in `rpm-ostree.spec.in` are up to date by comparing to the spec of the bundled version (`libdnf/libdnf.spec`). 4. Submit as a PR and wait until reviewed *and* CI is green. -5. Once merged, do `git pull $upstream && git reset --hard $upstream/master` on - your local `master` branch to make sure you're on the right commit. +5. Once merged, do `git pull $upstream && git reset --hard $upstream/main` on + your local `main` branch to make sure you're on the right commit. 6. Draft release notes by seeding a HackMD.io with `git shortlog $last_tag..` and ideally collaborating with others. Filter out the commits from `dependabot`. See previous releases for format. diff --git a/docs/_config.yml b/docs/_config.yml index 4aefc809..61075754 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -28,7 +28,7 @@ last_edit_time_format: "%b %e %Y at %I:%M %p" gh_edit_link: true gh_edit_link_text: "Edit this page on GitHub" gh_edit_repository: "https://github.com/coreos/rpm-ostree" -gh_edit_branch: "master" +gh_edit_branch: "main" gh_edit_source: docs gh_edit_view_mode: "tree" diff --git a/docs/architecture-daemon.md b/docs/architecture-daemon.md index 50e68015..fba67eb9 100644 --- a/docs/architecture-daemon.md +++ b/docs/architecture-daemon.md @@ -35,17 +35,17 @@ reason for this architecture is primarily: 3. to allow unprivileged users to make system mutations via polkit The D-Bus API is defined here: -https://github.com/coreos/rpm-ostree/blob/master/src/daemon/org.projectatomic.rpmostree1.xml +https://github.com/coreos/rpm-ostree/blob/main/src/daemon/org.projectatomic.rpmostree1.xml The rpm-ostree daemon runs as a systemd service which owns the `org.projectatomic.rpmostree1` name on the system D-Bus: -https://github.com/coreos/rpm-ostree/blob/master/src/daemon/rpm-ostreed.service.in +https://github.com/coreos/rpm-ostree/blob/main/src/daemon/rpm-ostreed.service.in When a client wants to talk to the daemon, the D-Bus daemon starts up the systemd service if it's not already running: -https://github.com/coreos/rpm-ostree/blob/master/src/daemon/org.projectatomic.rpmostree1.service.in +https://github.com/coreos/rpm-ostree/blob/main/src/daemon/org.projectatomic.rpmostree1.service.in ### Interacting with the daemon @@ -100,7 +100,7 @@ actions. We ship a base policy file which provide actions which should be allowed: -https://github.com/coreos/rpm-ostree/blob/master/src/daemon/org.projectatomic.rpmostree1.policy +https://github.com/coreos/rpm-ostree/blob/main/src/daemon/org.projectatomic.rpmostree1.policy Some distros may enhance this policy by shipping rules which dynamically calculate authorization based on e.g. group membership. For example, in diff --git a/docs/index.md b/docs/index.md index 0dffeb95..5a5118cd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -188,4 +188,4 @@ rpm-ostree specific talks: ## License rpm-ostree includes code licensed under GPLv2+, LGPLv2+, (Apache 2.0 OR MIT). -For more information, see [LICENSE](https://github.com/coreos/rpm-ostree/blob/master/LICENSE). +For more information, see [LICENSE](https://github.com/coreos/rpm-ostree/blob/main/LICENSE). diff --git a/docs/repo_structure.md b/docs/repo_structure.md index a02656d4..9f8a4bf9 100644 --- a/docs/repo_structure.md +++ b/docs/repo_structure.md @@ -52,7 +52,7 @@ nav_order: 9 ## Makefiles -These files are used when doing raw build instructions. You can find more info [here](https://github.com/projectatomic/rpm-ostree/blob/master/HACKING.md#raw-build-instructions): +These files are used when doing raw build instructions. You can find more info [here](https://github.com/projectatomic/rpm-ostree/blob/main/HACKING.md#raw-build-instructions): ``` . diff --git a/packaging/rpm-ostree.spec.in b/packaging/rpm-ostree.spec.in index 97d2a2aa..0d1a61f4 100644 --- a/packaging/rpm-ostree.spec.in +++ b/packaging/rpm-ostree.spec.in @@ -1,5 +1,5 @@ # The canonical copy of this spec file is upstream at: -# https://github.com/coreos/rpm-ostree/blob/master/packaging/rpm-ostree.spec.in +# https://github.com/coreos/rpm-ostree/blob/main/packaging/rpm-ostree.spec.in Summary: Hybrid image/package system Name: rpm-ostree diff --git a/tests/vmcheck/install.sh b/tests/vmcheck/install.sh index 6bf308e1..7375e201 100755 --- a/tests/vmcheck/install.sh +++ b/tests/vmcheck/install.sh @@ -3,7 +3,7 @@ set -euo pipefail # This is just a small wrapper for `make install`, but with the added logic to # pull in ostree packages from the build container. We always assume development -# and testing is against git master ostree and that the build container is +# and testing is against git main ostree and that the build container is # tracking e.g. CAHC or FAHC (see HACKING.md for more details). DESTDIR=${topsrcdir}/insttree