From owner-dev-commits-src-main@freebsd.org Thu Jan 14 15:48:52 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 0CF7F4E6426; Thu, 14 Jan 2021 15:48:52 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (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 (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DGpdH2sKlz4XZF; Thu, 14 Jan 2021 15:48:51 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1610639328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2/hktHRsnHVSHaRwvCRyDZewKgzs3gPMnryg8p6VlRQ=; b=pC3v21CFPjBXoWNCUoTQtBvhQF3P3QnZ59bpG5ZFpdIfMddF9AmD3HjM4sV+dCwTGeV5le 7fBpZ0qC5oiJrBsibzqgXOj+SkxADZB/4fuOLh+iH1tIk+/xg8W58Gu3eEmNr4P3tuWnTC SXpBaUi2qjewXwqQr8ZRTF/jevz0ee0= Received: from skull.home.blih.net (lfbn-idf2-1-745-114.w86-247.abo.wanadoo.fr [86.247.192.114]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 60f2867b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 14 Jan 2021 15:48:48 +0000 (UTC) Date: Thu, 14 Jan 2021 16:48:48 +0100 From: Emmanuel Vadot To: Kyle Evans Cc: Renato Botelho , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: aef769614f92 - main - pkgbase: differentiate package versions for ALPHA/BETA/PRERELEASE/RC phases Message-Id: <20210114164848.607e82e8f1612cb504b0a64f@bidouilliste.com> In-Reply-To: References: <202101141300.10ED0JiX032299@gitrepo.freebsd.org> <41f18274-d3c7-409e-5e47-4722c024e994@FreeBSD.org> <20210114160150.1c929cd2e9beceecf182184f@bidouilliste.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DGpdH2sKlz4XZF X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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:48:52 -0000 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 ? -- Emmanuel Vadot