From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id 6358ba66 for ; Fri, 20 Dec 2019 21:27:14 +0000 (UTC) Received: (qmail 8512 invoked by alias); 20 Dec 2019 21:27:08 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 45101 Received: (qmail 570 invoked by uid 1010); 20 Dec 2019 21:27:08 -0000 X-Qmail-Scanner-Diagnostics: from mail-yb1-f169.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.102.1/25663. spamassassin: 3.4.2. Clear:RC:0(209.85.219.169):SA:0(-1.9/5.0):. Processed in 24.31904 secs); 20 Dec 2019 21:27:08 -0000 X-Envelope-From: dana@dana.is X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.219.169 as permitted sender) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=u+HrchKy4QE0KbS7hUJrYEydTlKjonx/2ALqPejFBL4=; b=G40pBXVqL66EC3U85hDkILXSYAkxLNwn0HDzD7hOHfhG3/hoxZLU3JPeckTBywD89I i/3DmmKHzvmnDFW0sKiCsWJK1GHMlIHkO6G3sCPcK8HphhgY4l3IGxAy+FGh7kls3LJi MD366OaO6gt8Utg0SsLZyRjiNjDg+AMYGvOJ9NSm0lnwNZHgnqKHmVX2Yehhma0TNQkC OwReALc9+Vd7L4cE4jHvuMge6llkZmbW4ne2F6A7KRj26pUzqrI9B/5nEpOAJxjpDp5F bgHmnKMfuU4aHLCEN8IY2mVNh6EU8XRwCdwhr70i5/cVnUAICJ0tRp0udJ4D8VuyCMkC hkMQ== X-Gm-Message-State: APjAAAVkKV04OZAPmXDFiFm/JO8y75ghD4k8Zl7APbBnRjFfLOrladTk 2snMwnzUgtNXGY8BddcutuJa5w== X-Google-Smtp-Source: APXvYqwVJuX3HnF1xJFPi09p6TqxVja7wfh2vNGQbs+7RAsFe64fhYFjn51Sg3+3iR+NwEWk4ByUjg== X-Received: by 2002:a25:570b:: with SMTP id l11mr3186358ybb.84.1576877171394; Fri, 20 Dec 2019 13:26:11 -0800 (PST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.11\)) Subject: Re: Test release: 5.7.1-test-1 From: dana In-Reply-To: <20191217011646.cznpheompwvpmwi6@tarpaulin.shahaf.local2> Date: Fri, 20 Dec 2019 15:26:09 -0600 Cc: Zsh Workers List Content-Transfer-Encoding: quoted-printable Message-Id: References: <20191216035514.jj7bem3dspnmhdu4@tarpaulin.shahaf.local2> <20191217011646.cznpheompwvpmwi6@tarpaulin.shahaf.local2> To: Daniel Shahaf X-Mailer: Apple Mail (2.3445.104.11) On 16 Dec 2019, at 19:16, Daniel Shahaf wrote: > I'd say, go ahead with making the change unless anyone objects. It = won't > affect the numbering of stable releases so the risk of disruption is = minimal. OK, sorry, needed to let this sit for a while. I've updated the versioning scheme per your suggestion (as i interpreted = it, at least). I also updated the example versions so it's not quite *as* ahistorical. This is what you had in mind, right? If there are no further issues, i will probably post another test = release this week end (per workers/45047). I'm going to stick with the current = versioning scheme until 5.8 is out, so as not to mess up any version comparisons = between 5.7.x releases. dana diff --git a/Etc/creating-a-release.txt b/Etc/creating-a-release.txt index dfde269ae..485d7ebaf 100644 --- a/Etc/creating-a-release.txt +++ b/Etc/creating-a-release.txt @@ -6,37 +6,55 @@ To create a zsh release: - Bump or update: =20 Config/version.mk to today's date - Config/version.mk version number (sequence: 5.4.2, = 5.4.2-dev-$((i++)), 5.4.2-test-$((++j)), 5.5) + Config/version.mk version number Etc/FAQ.yo README NEWS =20 + The version-number sequence is as follows: + + 5.8, 5.8.0.1-dev, 5.8.0.2-test, 5.8.1, 5.8.1.1-dev, = 5.8.1.2-test, 5.9 + + Please note: + + - All version numbers in this document are examples only and may = not + reflect the actual version history of the shell. + - A slightly different ordering of version-number components was = used + prior to zsh 5.8. All subsequent releases should use the = scheme + described above. + - Usually there is only one -dev version (1-dev), but there may = be more + if for example there is a wordcode compatibility break, in = which case + the sequence would be something like 1-dev, 2-dev, 3-test, = .... + README should document compatibility-breaking changes. Generally, = NEWS should document new features and major bug fixes (but not routine fixes or = changes to completion/contrib functions). =20 + For -test releases, you may update the FAQ, README, etc., to refer to = the + upcoming stable version number. + - Commit those changes with an "unposted" ChangeLog entry. =20 - git commit -am "Test release: 5.5.1-test-1." && + git commit -am "Test release: 5.8.1.2-test." && zshdev-add-nnnnn-and-changelog unposted # (Everyone has a different way of getting the "unposted" magic = string # into ChangeLog and the log message. This script is how I do = it; YMMV; # see Etc/zsh-development-guide for alternative scripts.) =20 -- Create signed git tag named "zsh-5.5.1-..." (not "5.5.1-...") +- Create signed git tag named "zsh-5.8.1..." (not "5.8.1...") =20 - git tag --sign -m "Tag version zsh-5.5.1-test-1." = zsh-5.5.1-test-1 + git tag --sign -m "Tag version zsh-5.8.1.2-test." = zsh-5.8.1.2-test =20 - If the tagged release is a stable release (as opposed to a test = release): =20 - vi Config/version.mk # bump to 5.6-dev-0 and tomorrow's date + vi Config/version.mk # bump to 5.9.0.1-dev and tomorrow's date git commit -am "Post-release version bump." && zshdev-add-nnnnn-and-changelog unposted # or local equivalent (see above) =20 - Create tarball: =20 - git checkout zsh-5.5.1-test-1 + git checkout zsh-5.8.1.2-test git diff HEAD # ensure no local mods rm -f Doc/help.txt Doc/help/[_a-zA-Z0-9]* # some devs have had = issues with these Util/preconfig && ./configure ... @@ -50,11 +68,11 @@ To create a zsh release: git clone git://git.code.sf.net/p/zsh/web git clone ssh://git.code.sf.net/p/zsh/web =20 -- Upload to sf.net +- Upload to sf.net: =20 Test releases go to the "zsh-test" directory. Stable releases to zsh/ and zsh-doc/. - After uploading, select the tar.xz artifact, press the =F0=9F=9B=88= button ("View Details") to its right, and press [Select All] next to = "Default Download For:". This should cause sf.net to offer that = artifact in the "Looking for the latest version?" line. + For stable releases only, after uploading, select the tar.xz = artifact under zsh/, press the =F0=9F=9B=88 button ("View Details") to = its right, and press [Select All] next to "Default Download For:". This = should cause sf.net to offer that artifact in the "Looking for the = latest version?" line. =20 - If the new release is a stable release, update zsh.sf.net: =20 @@ -94,7 +112,7 @@ To create a zsh release: # several minutes to appear afterwards rsync ... =20 -- Upload the build artefacts to zsh.org/pub; you may need assistance = from +- For stable releases, upload the build artefacts to zsh.org/pub; you = may need assistance from another dev if you don't have access to do this. =20 - Post to -workers@ diff --git a/Etc/creating-a-release.txt b/Etc/creating-a-release.txt index 485d7ebaf..27a5b9a5a 100644 --- a/Etc/creating-a-release.txt +++ b/Etc/creating-a-release.txt @@ -63,7 +63,8 @@ To create a zsh release: make tarxz-doc tarxz-src for i in zsh*.tar.?z ; do gpg -ab -- $i ; done =20 -- [one time step] Add your key to http://zsh.sf.net/Arc/source.html; = see README in the 'web' repository for how to do this. Its URL is: +- [one time step] Add your key to http://zsh.sf.net/Arc/source.html; = see README + in the 'web' repository for how to do this. Its URL is: =20 git clone git://git.code.sf.net/p/zsh/web git clone ssh://git.code.sf.net/p/zsh/web @@ -72,7 +73,10 @@ To create a zsh release: =20 Test releases go to the "zsh-test" directory. Stable releases to zsh/ and zsh-doc/. - For stable releases only, after uploading, select the tar.xz = artifact under zsh/, press the =F0=9F=9B=88 button ("View Details") to = its right, and press [Select All] next to "Default Download For:". This = should cause sf.net to offer that artifact in the "Looking for the = latest version?" line. + For stable releases only, after uploading, select the tar.xz = artifact + under zsh/, press the =F0=9F=9B=88 button ("View Details") to = its right, and press + [Select All] next to "Default Download For:". This should cause = sf.net + to offer that artifact in the "Looking for the latest version?" = line. =20 - If the new release is a stable release, update zsh.sf.net: =20 @@ -112,8 +116,8 @@ To create a zsh release: # several minutes to appear afterwards rsync ... =20 -- For stable releases, upload the build artefacts to zsh.org/pub; you = may need assistance from - another dev if you don't have access to do this. +- For stable releases, upload the build artefacts to zsh.org/pub; you = may need + assistance from another dev if you don't have access to do this. =20 - Post to -workers@ =20