From owner-dev-commits-src-main@freebsd.org Thu Jan 14 15:58:47 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AD76A4E64B3; Thu, 14 Jan 2021 15:58:47 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DGprl3k7Cz4Y9b; Thu, 14 Jan 2021 15:58:47 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 6D5C84CED; Thu, 14 Jan 2021 15:58:47 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f180.google.com with SMTP id 2so3800241qtt.10; Thu, 14 Jan 2021 07:58:47 -0800 (PST) X-Gm-Message-State: AOAM530bafvmPUYiAa3XXYCU/giL2ndicTNQgtd4fuunUyzCQzj3e2+w CP6jJNgBiJPdIvD9kRb6CNNAx+j3RJUy/1xu8uk= X-Google-Smtp-Source: ABdhPJzJOVZeXe9dd545PiJlNWr6DP4tGuE7Zb7J+PtJeDbQCsmL21brTWkEf6AOTks02yy0yDy/6ZYkn7e8cjr31qc= X-Received: by 2002:aed:2e25:: with SMTP id j34mr7420781qtd.242.1610639927034; Thu, 14 Jan 2021 07:58:47 -0800 (PST) MIME-Version: 1.0 References: <202101141300.10ED0JiX032299@gitrepo.freebsd.org> <41f18274-d3c7-409e-5e47-4722c024e994@FreeBSD.org> <20210114160150.1c929cd2e9beceecf182184f@bidouilliste.com> <20210114164848.607e82e8f1612cb504b0a64f@bidouilliste.com> In-Reply-To: <20210114164848.607e82e8f1612cb504b0a64f@bidouilliste.com> From: Kyle Evans Date: Thu, 14 Jan 2021 09:58:34 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: aef769614f92 - main - pkgbase: differentiate package versions for ALPHA/BETA/PRERELEASE/RC phases To: Emmanuel Vadot Cc: Kyle Evans , Renato Botelho , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2021 15:58:47 -0000 On Thu, Jan 14, 2021 at 9:48 AM Emmanuel Vadot wrote: > > On Thu, 14 Jan 2021 09:44:22 -0600 > Kyle Evans wrote: > > > On Thu, Jan 14, 2021 at 9:41 AM Kyle Evans wrote: > > > > > > On Thu, Jan 14, 2021 at 9:02 AM Emmanuel Vadot wrote: > > > > > > > > On Thu, 14 Jan 2021 11:59:25 -0300 > > > > Renato Botelho wrote: > > > > > > > > > On 14/01/21 10:00, Emmanuel Vadot wrote: > > > > > > The branch main has been updated by manu: > > > > > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=aef769614f921660cb0262412426034cf5395ae5 > > > > > > > > > > > > commit aef769614f921660cb0262412426034cf5395ae5 > > > > > > Author: Emmanuel Vadot > > > > > > AuthorDate: 2021-01-14 12:56:38 +0000 > > > > > > Commit: Emmanuel Vadot > > > > > > CommitDate: 2021-01-14 13:00:04 +0000 > > > > > > > > > > > > pkgbase: differentiate package versions for ALPHA/BETA/PRERELEASE/RC phases > > > > > > > > > > > > The current postfix conversions are: > > > > > > > > > > > > CURRENT / STABLE -> .sYYYYMMDDhhmmss > > > > > > ALPHAx -> .ax, so 11.3-ALPHA1 becomes 11.3.a1 > > > > > > BETAx -> .bx, so 12.1-BETA2 becomes 12.1.b2 > > > > > > RCx -> .rcx, so 13.0-RC3 becomes 13.0.rc3 > > > > > > PRERELEASE -> .p, so 11.3-PRERELEASE becomes 11.3.p > > > > > > RELEASE -> (nothing), so 12.1-RELEASE becomes 12.1 > > > > > > > > > > Wouldn't it be necessary to add timestamp information on PRERELEASE as > > > > > done on CURRENT/STABLE ? > > > > > > > > Yes it would, this wasn't one of the reason for the revert but it was > > > > brough to me after. > > > > -STABLE should always be .sYYYYMMDDhhmmss even when in the PRERELEASE > > > > phase. > > > > > > I had a chance to play with it a little bit, and my proposal is: > > > > > > 1.) Drop -PRERELEASE as a non-CURRENT/STABLE versioning scheme in the > > > pkg versions > > > 2.) Use .plYYYYMMDDhhmmss instead of .sYYYYMMDDhhmmss for > > > CURRENT/STABLE (.pl sorts before all others in the pkg version scheme > > > quite intentionally) > > > 3.) Reinstate all of the others as committed here > > > > > > This basically works; it's a little kludgy during a release process up > > > until the version on -STABLE is bumped up to the next minor if you're > > > trying to hop off an alpha/beta/rc back to stable, but I think that's > > > acceptable. It's a narrow window in which your slide over to -STABLE > > > is considered a downgrade since it gets bumped promptly at the > > > conclusion of the release cycle. > > > > > > root@viper:~/pkg/libpkg# pkg version -t 13.0.a1 13.0.b1 > > > < > > > root@viper:~/pkg/libpkg# pkg version -t 13.0.b1 13.0.rc1 > > > < > > > root@viper:~/pkg/libpkg# pkg version -t 13.0.rc1 13.0 > > > < > > > > I omitted the first step, which is arguably the most important one: > > > > root@viper:~/pkg/libpkg# pkg version -t 13.0.pl2021011313063 13.0.a1 > > < > > Seems good to me, now if only I knew what 'pl' stands for that would > be good :) > Can you do a patch or should I ? > Phew, I'm glad I'm not the only one. :-) I'm going to call it "(pl)aceholder," but I hadn't seen any indication of its actual meaning when it arrived back in '04 (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=56961) I'll whip up a patch later today. Thanks, Kyle Evans