yes. It's planned for next week.
(some pagure.io projects we control should go tomorrow (Phase1))
just want to be sure that our tooling is ready and works with this
change since we hardcode "fedora-master" in many places.
We are meeting up later today to do some planning, I hope we can get
staging moved over sooner and then you could test against that?
kevin
--
Thanks!
Tomas
On Thu, Dec 3, 2020 at 4:06 PM Ben Cotton <bcotton(a)redhat.com> wrote:
>
>
https://fedoraproject.org/wiki/Changes/GitRepos-master-to-main
>
> == Summary ==
>
> This Change will move Fedora git repositories to use "main" as the
> default git branch instead of "master". Specific repositories will be
> manually moved and default git branch for new projects will be set to
> use "main".
>
> The Fedora Community strives to be open and welcoming. Some language
> around our git repositories is dated and could be more inclusive. Many
> git repositories currently use "master" as the default branch. This
> Change will move many repositories (see below) to use a "main" branch
> as default. This small bit of naming adjustment is in-line with
> Fedora's vision for free and open source software built by inclusive,
> welcoming, and open-minded communities.
>
>
> == Owner ==
>
> * Name: [[User:Kevin| Kevin Fenzi]], [[User:bcotton| Ben Cotton]],
> [[User:pingou| pingou]], [[User:mohanboddu| Mohan Boddu]],
> [[User:till| Till Maas]]
> * Email: kevin(a)scrye.com, bcotton(a)redhat.com, pingou(a)pingoured.fr,
> mboddu(a)bhujji.com, opensource(a)till.name
>
>
> == Detailed Description ==
>
> The Fedora Project controls a number of git repositories. This change
> will move the default branch (that is, the git branch used when
> nothing is specified) from 'master' to 'main'. Existing git clones
> will need to pull to get the changed default branch. Existing Pull
> Requests against the 'master' branch will need to be rebased against
> the 'main' branch. Documentation will be updated.
>
>
>
> == Benefit to Fedora ==
>
> The Fedora Project will be a more welcoming place for new contributors.
>
>
> == Scope ==
>
> This change will take place in a number of phases:
>
> === Phase0 - 2020-12-14 ===
>
> A guide will be published to explain how maintainers/project
> managers can change the default
> branch on pagure.io, which they can then do based in their projects desires.
>
> === Phase1 - 2020-12-15 ===
>
> The following repos will be switched:
>
>
src.fedoraproject.org/flatpacks/*
> pagure.io:
> releng
> releng/*
> fedora-comps
> fedora-kickstarts
> fedora-infrastructure
> fedora-lorax-templates
> fedora-mediawikitheme
> fedora-packager
> fedora-infra/*
> infra-docs
> koji-fedmsg-plugin
> workstation-ostree-config
> pungi-fedora
>
github.com
> fedora-infra/*
>
> === Phase2 - 2021-01-13 ===
>
>
src.fedoraproject.org/*
> pagure.io default for new projects will be changed to 'main'
>
> * Proposal owners:
>
> Switching all above listed projects git repos to use 'main'
> Deleting the 'master' branch
> Announcing when changes have been made on devel-announce / other lists.
>
> * Other developers:
>
> Other developers are encouraged to change their upstream projects
> on pagure.io, github or gitlab.
>
> * Release engineering:
>
> Releng will adjust any scripts that assume 'master' branch to use
> 'main' instead. The list includes and maybe few more
> [
https://pagure.io/releng/blob/master/f/scripts/update-critpath.py
> update-critpath.py]
> [
https://pagure.io/releng/blob/master/f/scripts/block_retired.py
> block_retired.py]
> [
https://pagure.io/releng/blob/master/f/scripts/update-docs.sh
> update-docs.sh]
> [
https://pagure.io/releng/blob/master/f/scripts/find_unblocked_orphans.py
> find_unblocked_orphans.py]
> [
https://pagure.io/releng/blob/master/f/scripts/mass-rebuild-second-run.py
> mass-rebuild-second-run.py]
> [
https://pagure.io/releng/blob/master/f/scripts/adjust-eol-modules.py
> adjust-eol-modules.py]
> [
https://pagure.io/releng/blob/master/f/scripts/pdc/adjust-eol-modules.py
> adjust-eol-modules.py]
> [
https://pagure.io/releng/blob/master/f/scripts/pdc/adjust-eol-modules.py
> adjust-eol-modules.py]
> [
https://pagure.io/releng/blob/master/f/scripts/pdc/adjust-eol.py
> adjust-eol.py]
>
[
https://pagure.io/releng/blob/master/f/scripts/pdc/create-new-release-bra...
> create-new-release-branches.py]
> [
https://pagure.io/releng/blob/master/f/scripts/pdc/create-branch.py
> create-branch.py]
> [
https://pagure.io/releng/blob/master/f/scripts/pdc/adjust-eol-all.py
> adjust-eol-all.py]
> [
https://pagure.io/releng/blob/master/f/scripts/check-unretirement.py
> check-unretirement.py]
> [
https://pagure.io/releng/blob/master/f/scripts/mass-rebuild-special.py
> mass-rebuild-special.py]
> [
https://pagure.io/releng/blob/master/f/scripts/need-rebuild.py
> need-rebuild.py]
> [
https://pagure.io/releng/blob/master/f/scripts/distgit-branch-unused.py
> distgit-branch-unused.py]
> [
https://pagure.io/releng/blob/master/f/scripts/create-new-release-branche...
> create-new-release-branches.py]
>
> * Policies and guidelines: N/A
>
> * Trademark approval: N/A
>
> * Alignment with Objectives:
>
>
> == Upgrade/compatibility impact ==
>
> Users with old checkouts will need to update their git configuration
> or re-clone repositories that have changed before they can see any new
> changes.
>
> Repos used to build content for
docs.fedoraproject.org can change the
> default git branch, but the Antora module version (in `antora.yml`)
> should remain `master` pending support for alternate "unversioned"
> versions upstream.
>
>
> == How To Test ==
>
> # git clone <one of the listed repositories>
> # cd <repositoryname>
> # git branch
>
> should return: `* main`
>
>
> == User Experience ==
>
> Users and developers will see more welcoming language and that the
> fedora project expended effort to be more welcoming to them.
>
>
> == Dependencies ==
>
> none
>
>
> == Contingency Plan ==
>
> * Contingency mechanism: Revert repositories, scripts, and docs back
> to the unwelcoming 'master'
> * Contingency date: 2020-01-13
>
>
> == Documentation ==
>
> A short guide on how to change this for pagure.io will be produced.
>
>
> == Release Notes ==
>
> Many git repositories used to create Fedora releases were moved to use
> a 'main' branch instead of a 'master' branch. The Fedora Project
> envisions a world where everyone benefits from free and open source
> software built by inclusive, welcoming, and open-minded communities.
>
>
> --
> Ben Cotton
> He / Him / His
> Senior Program Manager, Fedora & CentOS Stream
> Red Hat
> TZ=America/Indiana/Indianapolis
> _______________________________________________
> devel mailing list -- devel(a)lists.fedoraproject.org
> To unsubscribe send an email to devel-leave(a)lists.fedoraproject.org
> Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines:
https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives:
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org
_______________________________________________
devel mailing list -- devel(a)lists.fedoraproject.org
To unsubscribe send an email to devel-leave(a)lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines:
https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org