From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EE79D1386F1 for ; Sun, 9 Aug 2015 20:03:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 120D6141B2; Sun, 9 Aug 2015 20:03:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 01E6AE07BA for ; Sun, 9 Aug 2015 20:03:07 +0000 (UTC) Received: from [192.168.1.2] (c-73-53-75-119.hsd1.wa.comcast.net [73.53.75.119]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zlg) by smtp.gentoo.org (Postfix) with ESMTPSA id 021AA340834 for ; Sun, 9 Aug 2015 20:03:06 +0000 (UTC) Subject: Re: [gentoo-dev] Git Migration: go-live! To: gentoo-dev@lists.gentoo.org References: From: "Daniel Campbell (zlg)" Message-ID: <55C7B1FA.7080406@gentoo.org> Date: Sun, 9 Aug 2015 13:03:06 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Archives-Salt: c54142c3-54a6-41b7-bba2-9b0420193009 X-Archives-Hash: a687d3998c260d567e9d8c94c75f28aa -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 On 08/08/2015 10:36 PM, Robin H. Johnson wrote: > On Sat, Aug 08, 2015 at 05:47:14PM +0000, Robin H. Johnson wrote: >> On Thu, Jul 02, 2015 at 09:39:52PM +0000, Robin H. Johnson >> wrote: >>> 2015/08/08 15:00 UTC - Freeze 2015/08/08 19:00 UTC - Git >>> commits open for developers > This is going live in a few minutes. There was a lot of delays and > snags that were hit. QA has a lot of reviewing to do of in-tree > patches with long-standing CVS keyword damage. gkeys is also not > sufficiently baked, so we're using some scripting for now instead > [1]. > > The new setup DOES enforce that commits AND pushes are signed. > > I'm only 90% sure that everything works, but I've spent almost the > entire day on it, and there's more to go tomorrow. > > Other old CVS repos are still closed for the moment, they will > re-open tomorrow. > >>> 2015/08/09 01:00 UTC - Rsync live again (with lagged >>> changelog) 2015/08/11 - History repo available to >>> graft 2015/08/12 - rsync mirrors carry up-to-date >>> changelogs again > These parts are still pending. > > Quick instructions: Set PORTAGE_GPG_KEY="0xLONG-GPG-KEY" in your > make.conf $ git config user.signingkey 0xLONG-GPG-KEY $ git clone > git+ssh://git@git.gentoo.org/repo/gentoo.git $ vim ... $ repoman > commit -m '...' [2] $ git push --signed > > (some time later, when you have local unpushed commits you want to > rebase instead of merging) $ git pull --rebase -S $ vim ... $ > repoman commit -m '...' $ git push --signed > > (some time later, when you have a local branch you want to merge) $ > git merge -S some-branch $ git push --signed > > [1] The keys as they are in LDAP right now have been used. If you > need to change your key, please ping infra as well, so I can update > the temporary setup. $ ldapsearch 'gentooStatus=active' > gpgfingerprint -Z -LLL \ |grep gpgfingerprint |cut -d: -f2- |tr -d > ' ' \ |grep -v 'undefined' | xargs gpg --recv > > [2] If you commit directly with "git commit" you MUST pass -S (and > ideally -s). > I'd like to thank you and anyone else who's worked on the Git migration. It's not a trivial undertaking and I look forward to working on ebuilds with Git! The workflow wiki page is very helpful; I've added it to my Watchlist so I can stay up to date on changes. Thanks again for your efforts! If you'd like any assistance in setting up hooks, I'd be glad to help. - -- Daniel Campbell - Gentoo Developer OpenPGP Key: 0x1EA055D6 @ hkp://keys.gnupg.net fpr: AE03 9064 AE00 053C 270C 1DE4 6F7A 9091 1EA0 55D6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVx7H1AAoJEAEkDpRQOeFwYloQAIPXgVMhCvT6xLxPd6OVtOtU pDHuRUS3aGXWowGnf4BFTvV3ILpca/qm/ExVe+As1B7atCkP3XeRYP4y0TB31Ol1 QQMNvIZ8XkItjbQg8QTg0EMqA45IKMV//4ZwVdsAjPq3686nLOtfjAREB6SwO3nS 5huXcJ2+D1wxKAAAORGwkNYIjKzwGd/BnbDWTyNR/pUekrd6nBo/du5v7vo5j00S ORsc4JXjhoQ56KCvNDz4kkzcCiPE0equto7b/7ZL7Cb7hkV6d8u5YmwzQPGwzk4I OztEF88xpOvDHsgVuV1UStOLX3trVmkUZElwIektw7+ZOZZ7IwLzPRGHUDronSR/ mO6gdxaPqUCfjMNsg7n54dJVUNhkPjCu/8IispfnfmFJ/xGdnznAizkW25zJH5Vx +DVC8wac46/74SBmJlipRuMiMKAQu5kZP4szGFd/n4bYyQplnQ/7u+aX/IbMQoY+ JWWNHRZfjHYKjJcWA+sxYuWQp5RwcL//o07BR3zjjv7LOTEVwtnOApppV+E9bOyF 2OgTDPOhLao+D5Gm0b7T7nMT34DAw9Io2D7Nbo29YQFuXim6/6jPB9uJeSswan5J uUUJQnJOElSiM85EUJm4ZjKXS0zHjNMoiyFTWi7C8eUu1eeJgCsTNqFb0/3vDOct 9OfweV2Hm2CY/G6Vwk00 =2eg6 -----END PGP SIGNATURE-----