From dchen at redhat.com Mon Sep 11 00:32:17 2017 From: dchen at redhat.com (Ding Yi Chen) Date: Sun, 10 Sep 2017 20:32:17 -0400 (EDT) Subject: [zanata-devel] Invalid release: platform-4.2.4 In-Reply-To: <186120726.6860857.1505089499210.JavaMail.zimbra@redhat.com> Message-ID: <1963502036.6861130.1505089937446.JavaMail.zimbra@redhat.com> Hi, We are sorry to announce that, due to our process error, platform-4.2.4 is invalid. We are aware of the issue and are working to fix it as soon as possible. In the meantime, please downgrade to 4.2.1. Regards, -- Ding-Yi CHEN Software Engineer, Globalization Group Red Hat Asia-Pacific Pty Ltd dchen at redhat.com Twitter: @redhatway | Instagram: @redhatinc | Snapchat: @redhatsnaps From sflaniga at redhat.com Mon Sep 11 02:14:46 2017 From: sflaniga at redhat.com (Sean Flanigan) Date: Mon, 11 Sep 2017 12:14:46 +1000 Subject: [zanata-devel] Invalid release: platform-4.2.4 In-Reply-To: <1963502036.6861130.1505089937446.JavaMail.zimbra@redhat.com> References: <186120726.6860857.1505089499210.JavaMail.zimbra@redhat.com> <1963502036.6861130.1505089937446.JavaMail.zimbra@redhat.com> Message-ID: What actually happened is that the *master* branch (with new, less tested code) was accidentally merged into the *release* branch (older, more stable code). These changes went into the invalid 4.2.4 release. Note that we are now using GitHub's protected branch feature to minimise the chances of this happening again! To fix the *release* branch, we would have to revert 400+ commits, or rewrite the history of the branch (eg git reset to commit 73b1dd29), both unpleasant options with side effects. Then we would have to cherry-pick various fixes into *release* again, fix merge conflicts and do a fair bit of testing. This would also mean that Zanata 4.2.5 would have some older code in it (missing bug-fixes and features) compared to the invalid release 4.2.4. The release testing for Zanata 4.3 is starting soon anyway, so we've decided instead to declare the *release* branch (and Zanata 4.2.5) a lost cause. *If you're running Zanata 4.2.1*, hang on, Zanata 4.3 should be along soon. *If you're running Zanata 4.2.4*, you're really running a pre-release version of Zanata 4.3.0, so you might want to downgrade to 4.2.1 for now. *If you're working on Zanata's codebase*, please don't work from the *release* branch until we have branched for 4.3, probably later this week. Until then, you should probably work with the *master* branch. If you *really* need to do maintenance work on 4.2, please talk to us on the zanata-devel mailing list and we'll try to help. Regards, Sean. On 11 September 2017 at 10:32, Ding Yi Chen wrote: > Hi, > > We are sorry to announce that, due to our process error, platform-4.2.4 is > invalid. > > We are aware of the issue and are working to fix it as soon as possible. > In the meantime, please downgrade to 4.2.1. > > Regards, > > -- > Ding-Yi CHEN > > Software Engineer, Globalization Group > Red Hat Asia-Pacific Pty Ltd > dchen at redhat.com > Twitter: @redhatway | Instagram: @redhatinc | Snapchat: @redhatsnaps > > _______________________________________________ > zanata-devel mailing list > zanata-devel at redhat.com > https://www.redhat.com/mailman/listinfo/zanata-devel > -- Sean Flanigan Principal Software Engineer Globalisation Tools Engineering Red Hat -------------- next part -------------- An HTML attachment was scrubbed... URL: From dchen at redhat.com Fri Sep 15 03:57:19 2017 From: dchen at redhat.com (Ding Yi Chen) Date: Thu, 14 Sep 2017 23:57:19 -0400 (EDT) Subject: [zanata-devel] [Branching] master is now 4.4.0-SNAPSHOT In-Reply-To: <56409091.8931387.1505447440157.JavaMail.zimbra@redhat.com> Message-ID: <1391749254.8932183.1505447839100.JavaMail.zimbra@redhat.com> Hi, The branching for release is completed. master branch is now 4.4.0-SNAPSHOT release branch is now 4.3.0-SNAPSHOT Note that previously release branch was broken, thus legacy is not overwritten, and legacy branch is still 4.1.2-SNAPSHOT Regards, -- Ding-Yi CHEN Software Engineer, Globalization Group Red Hat Asia-Pacific Pty Ltd dchen at redhat.com Twitter: @redhatway | Instagram: @redhatinc | Snapchat: @redhatsnaps From sflaniga at redhat.com Fri Sep 15 04:29:31 2017 From: sflaniga at redhat.com (Sean Flanigan) Date: Fri, 15 Sep 2017 14:29:31 +1000 Subject: [zanata-devel] [zanata-dev-internal] [Branching] master is now 4.4.0-SNAPSHOT In-Reply-To: <1391749254.8932183.1505447839100.JavaMail.zimbra@redhat.com> References: <56409091.8931387.1505447440157.JavaMail.zimbra@redhat.com> <1391749254.8932183.1505447839100.JavaMail.zimbra@redhat.com> Message-ID: Thanks Dean. On 15 September 2017 at 13:57, Ding Yi Chen wrote: > Hi, > > The branching for release is completed. > > master branch is now 4.4.0-SNAPSHOT > release branch is now 4.3.0-SNAPSHOT > > Note that previously release branch was broken, thus legacy is not > overwritten, > and legacy branch is still 4.1.2-SNAPSHOT > > Regards, > -- > Ding-Yi CHEN > > Software Engineer, Globalization Group > Red Hat Asia-Pacific Pty Ltd > dchen at redhat.com > Twitter: @redhatway | Instagram: @redhatinc | Snapchat: @redhatsnaps > > -- Sean Flanigan Principal Software Engineer Globalisation Tools Engineering Red Hat -------------- next part -------------- An HTML attachment was scrubbed... URL: