Today is "freeze day". That means (if I understand correctly) that sometime (later today? tomorrow morning?) I (or perhaps Elisa) will merge the P5:dev branch into P5:master, and Stylesheets:dev branch into Stylesheets:master. Any objections there? Then we have 2 weeks to take a look at the stuff in the master branches and make sure it's OK before release on Tue 03-29.
The procedure is outlined here:
http://www.tei-c.org/Activities/Council/Working/tcw22.xml and we need to be
mindful of anything that's missing from that. Telling the Jenkins managers
to add a build for the release branch is one thing that occurs immediately.
Please do NOT merge anything into master yet. I would strongly suggest
getting the dev build green again before making the release branch. I will
be available today to help with the release branching if needed.
On Tue, Mar 15, 2016 at 8:43 AM, Syd Bauman
Today is "freeze day". That means (if I understand correctly) that sometime (later today? tomorrow morning?) I (or perhaps Elisa) will merge the P5:dev branch into P5:master, and Stylesheets:dev branch into Stylesheets:master. Any objections there?
Then we have 2 weeks to take a look at the stuff in the master branches and make sure it's OK before release on Tue 03-29. -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived
Understood, and I will read up on the procedures. I'll keep a weather eye on this today, and Syd, ping me if you want to Skype. I've got a bunch of meetings scattered through the day (like a weather front) but some little gaps between them. I'll have a solid stretch of time after 5 (EST) today. Elisa Typeset by hand on my iPad
On Mar 15, 2016, at 8:49 AM, Hugh Cayless
wrote: The procedure is outlined here: http://www.tei-c.org/Activities/Council/Working/tcw22.xml and we need to be mindful of anything that's missing from that. Telling the Jenkins managers to add a build for the release branch is one thing that occurs immediately.
Please do NOT merge anything into master yet. I would strongly suggest getting the dev build green again before making the release branch. I will be available today to help with the release branching if needed.
On Tue, Mar 15, 2016 at 8:43 AM, Syd Bauman
wrote: Today is "freeze day". That means (if I understand correctly) that sometime (later today? tomorrow morning?) I (or perhaps Elisa) will merge the P5:dev branch into P5:master, and Stylesheets:dev branch into Stylesheets:master. Any objections there?
Then we have 2 weeks to take a look at the stuff in the master branches and make sure it's OK before release on Tue 03-29. -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived
Suggested changes to TCW22 (
http://www.tei-c.org/Activities/Council/Working/tcw22.xml):
"At least one week before releasing, we enter a review period, during which
the only changes made to the code to be released should be to fix errors,
rather than to add new features. A release branch will be created by the
release technician, to which ONLY release-blocking bug fixes and
corrections to typographical errors will be pushed. The release technician
should announce a temporary hold on pushes to the dev branch on the Council
list, then create the branch and push it to GitHub using the following
commands:"
...
"After the release branch has been pushed, the release technician should
inform the Council list and ask the maintainers of the TEI Jenkins systems
(currently Martin Holmes, Peter Stadler, and James Cummings) to add a build
of the release branch."
Thoughts?
Also, the Stylesheets are still their own animal somewhat, and are not
covered properly in TCW22 yet. I'm happy to deal with them this go-round
and add instructions to TCW22 as I go.
On Tue, Mar 15, 2016 at 9:05 AM, Elisa
Understood, and I will read up on the procedures. I'll keep a weather eye on this today, and Syd, ping me if you want to Skype. I've got a bunch of meetings scattered through the day (like a weather front) but some little gaps between them. I'll have a solid stretch of time after 5 (EST) today.
Elisa Typeset by hand on my iPad
On Mar 15, 2016, at 8:49 AM, Hugh Cayless
wrote: The procedure is outlined here: http://www.tei-c.org/Activities/Council/Working/tcw22.xml and we need to be mindful of anything that's missing from that. Telling the Jenkins managers to add a build for the release branch is one thing that occurs immediately.
Please do NOT merge anything into master yet. I would strongly suggest getting the dev build green again before making the release branch. I will be available today to help with the release branching if needed.
On Tue, Mar 15, 2016 at 8:43 AM, Syd Bauman
wrote: Today is "freeze day". That means (if I understand correctly) that sometime (later today? tomorrow morning?) I (or perhaps Elisa) will merge the P5:dev branch into P5:master, and Stylesheets:dev branch into Stylesheets:master. Any objections there?
Then we have 2 weeks to take a look at the stuff in the master branches and make sure it's OK before release on Tue 03-29. -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived
Can I still push changes to dev, or has the ice age already begun?
-----Ursprüngliche Nachricht-----
Von: tei-council-bounces@lists.tei-c.org [mailto:tei-council-bounces@lists.tei-c.org] Im Auftrag von Hugh Cayless
Gesendet: Dienstag, 15. März 2016 14:20
An: TEI Council
Betreff: Re: [tei-council] it's freezing today
Suggested changes to TCW22 (
http://www.tei-c.org/Activities/Council/Working/tcw22.xml):
"At least one week before releasing, we enter a review period, during which the only changes made to the code to be released should be to fix errors, rather than to add new features. A release branch will be created by the release technician, to which ONLY release-blocking bug fixes and corrections to typographical errors will be pushed. The release technician should announce a temporary hold on pushes to the dev branch on the Council list, then create the branch and push it to GitHub using the following commands:"
...
"After the release branch has been pushed, the release technician should inform the Council list and ask the maintainers of the TEI Jenkins systems (currently Martin Holmes, Peter Stadler, and James Cummings) to add a build of the release branch."
Thoughts?
Also, the Stylesheets are still their own animal somewhat, and are not covered properly in TCW22 yet. I'm happy to deal with them this go-round and add instructions to TCW22 as I go.
On Tue, Mar 15, 2016 at 9:05 AM, Elisa
Understood, and I will read up on the procedures. I'll keep a weather eye on this today, and Syd, ping me if you want to Skype. I've got a bunch of meetings scattered through the day (like a weather front) but some little gaps between them. I'll have a solid stretch of time after 5 (EST) today.
Elisa Typeset by hand on my iPad
On Mar 15, 2016, at 8:49 AM, Hugh Cayless
wrote: The procedure is outlined here: http://www.tei-c.org/Activities/Council/Working/tcw22.xml and we need to be mindful of anything that's missing from that. Telling the Jenkins managers to add a build for the release branch is one thing that occurs immediately.
Please do NOT merge anything into master yet. I would strongly suggest getting the dev build green again before making the release branch. I will be available today to help with the release branching if needed.
On Tue, Mar 15, 2016 at 8:43 AM, Syd Bauman
wrote: Today is "freeze day". That means (if I understand correctly) that sometime (later today? tomorrow morning?) I (or perhaps Elisa) will merge the P5:dev branch into P5:master, and Stylesheets:dev branch into Stylesheets:master. Any objections there?
Then we have 2 weeks to take a look at the stuff in the master branches and make sure it's OK before release on Tue 03-29. -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived
-- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council PLEASE NOTE: postings to this list are publicly archived
If your changes aren't schema-affecting, then I think you can. i.e. changing examples, notes, clarifying documentation, etc. all count as prose corrections I think. -james On 15/03/16 23:10, Scholger, Martina (martina.scholger@uni-graz.at) wrote:
Can I still push changes to dev, or has the ice age already begun?
-----Ursprüngliche Nachricht----- Von: tei-council-bounces@lists.tei-c.org [mailto:tei-council-bounces@lists.tei-c.org] Im Auftrag von Hugh Cayless Gesendet: Dienstag, 15. März 2016 14:20 An: TEI Council Betreff: Re: [tei-council] it's freezing today
Suggested changes to TCW22 ( http://www.tei-c.org/Activities/Council/Working/tcw22.xml):
"At least one week before releasing, we enter a review period, during which the only changes made to the code to be released should be to fix errors, rather than to add new features. A release branch will be created by the release technician, to which ONLY release-blocking bug fixes and corrections to typographical errors will be pushed. The release technician should announce a temporary hold on pushes to the dev branch on the Council list, then create the branch and push it to GitHub using the following commands:" ... "After the release branch has been pushed, the release technician should inform the Council list and ask the maintainers of the TEI Jenkins systems (currently Martin Holmes, Peter Stadler, and James Cummings) to add a build of the release branch."
Thoughts?
Also, the Stylesheets are still their own animal somewhat, and are not covered properly in TCW22 yet. I'm happy to deal with them this go-round and add instructions to TCW22 as I go.
On Tue, Mar 15, 2016 at 9:05 AM, Elisa
wrote: Understood, and I will read up on the procedures. I'll keep a weather eye on this today, and Syd, ping me if you want to Skype. I've got a bunch of meetings scattered through the day (like a weather front) but some little gaps between them. I'll have a solid stretch of time after 5 (EST) today.
Elisa Typeset by hand on my iPad
On Mar 15, 2016, at 8:49 AM, Hugh Cayless
wrote: The procedure is outlined here: http://www.tei-c.org/Activities/Council/Working/tcw22.xml and we need to be mindful of anything that's missing from that. Telling the Jenkins managers to add a build for the release branch is one thing that occurs immediately. Please do NOT merge anything into master yet. I would strongly suggest getting the dev build green again before making the release branch. I will be available today to help with the release branching if needed.
On Tue, Mar 15, 2016 at 8:43 AM, Syd Bauman
wrote: Today is "freeze day". That means (if I understand correctly) that sometime (later today? tomorrow morning?) I (or perhaps Elisa) will merge the P5:dev branch into P5:master, and Stylesheets:dev branch into Stylesheets:master. Any objections there?
Then we have 2 weeks to take a look at the stuff in the master branches and make sure it's OK before release on Tue 03-29. -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived
-- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived
-- Dr James Cummings, James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford
Freeze obviously did not actually happen today (Tue 03-15). Luckily, we built a week of extra time into the schedule, so this doesn't bother me. Elisa and I spoke on the phone today, and hope that the various loose ends will be tied up by tomorrow late afternoon or early evening our time for the actual freeze. Question for everyone: are we still releasing on SourceForge as well? Hugh -- Looks fine to me. Question, though: why do we bother with a separate release branch, rather than use 'master' for this purpose? (I'm not suggesting we should use master, I just don't see why not.) As for the Stylesheets, I'm more than happy either way -- but I think that whatever we do for the Stylesheets should, as far as possible, mirror the process that we do in P5/ ... i.e., make the same branches, have same review period during which only bug-fixes should get checked into new branch, etc.
Suggested changes to TCW22 ( http://www.tei-c.org/Activities/Council/Working/tcw22.xml):
"At least one week before releasing, we enter a review period, during which the only changes made to the code to be released should be to fix errors, rather than to add new features. A release branch will be created by the release technician, to which ONLY release-blocking bug fixes and corrections to typographical errors will be pushed. The release technician should announce a temporary hold on pushes to the dev branch on the Council list, then create the branch and push it to GitHub using the following commands:" ... "After the release branch has been pushed, the release technician should inform the Council list and ask the maintainers of the TEI Jenkins systems (currently Martin Holmes, Peter Stadler, and James Cummings) to add a build of the release branch."
Thoughts?
Also, the Stylesheets are still their own animal somewhat, and are not covered properly in TCW22 yet. I'm happy to deal with them this go-round and add instructions to TCW22 as I go.
Am 16.03.2016 um 05:18 schrieb Syd Bauman
: Hugh -- Looks fine to me. Question, though: why do we bother with a separate release branch, rather than use 'master' for this purpose? (I'm not suggesting we should use master, I just don't see why not.) Because master should always be stable and release can integrate hot fixes.
Best Peter
participants (6)
-
Elisa
-
Hugh Cayless
-
James Cummings
-
Peter Stadler
-
Scholger, Martina (martina.scholger@uni-graz.at)
-
Syd Bauman