From 21b66131c4ee802b6ae799b1fc7544bb1baaa080 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Jan 06 2021 17:18:58 +0000 Subject: Moving git default branches to main Signed-off-by: Mohan Boddu --- diff --git a/fedora.conf b/fedora.conf index 0518446..58b84d4 100644 --- a/fedora.conf +++ b/fedora.conf @@ -7,14 +7,14 @@ release_version = 'Rawhide' comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', - 'branch': 'master', + 'branch': 'main', 'file': 'comps-rawhide.xml', 'command': 'make comps-rawhide.xml' } module_defaults_dir = { 'scm': 'git', 'repo': 'https://pagure.io/releng/fedora-module-defaults.git', - 'branch': 'master', + 'branch': 'main', 'dir': '.' } @@ -779,7 +779,7 @@ ostree = { "force_new_commit": True, "treefile": "fedora-silverblue.yaml", "config_url": "https://pagure.io/workstation-ostree-config.git", - "config_branch": "master", + "config_branch": "main", "repo": "Everything", "tag_ref": False, "ostree_repo": "/mnt/koji/compose/ostree/repo/", @@ -813,7 +813,7 @@ ostree_installer = [ "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f33 app/org.gnome.baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.FileRoller/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.gedit/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.gnome.Screenshot/x86_64/stable app/org.gnome.Weather/x86_64/stable", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'master', + 'template_branch': 'main', # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'], 'failable': ['*'], @@ -839,7 +839,7 @@ ostree_installer = [ "flatpak_remote_refs=", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'master', + 'template_branch': 'main', # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'], 'failable': ['*'], @@ -865,7 +865,7 @@ ostree_installer = [ "flatpak_remote_refs=", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'master', + 'template_branch': 'main', # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'], 'failable': ['*'],