The circular dependency is discussed here: https://github.com/TEIC/Stylesheets/issues/147 The Stylesheets build process gets some of its P5 sources from the current release version on tei-c.org. One solution would be to check for the existence of a Jenkins job in an expected location derived from the current folder in which the Stylesheets build is executing, and if it exists, draw from there; or manually configure the Jenkins builds to point to matching sources. But the circular dependency is not much different there; the last successful P5 builds have been built with the Stylesheets, so any change to both which makes the last version of each incompatible with the current version of the other could cause problems. I don't believe splitting P5 from the Stylesheets was a good decision, really. Cheers, Martin On 2016-12-15 04:46 AM, Magdalena Turska wrote:
We had some small change to release notes, so the TEI build just finished succesfully (took 2h, sigh), Stylesheets build had just started. Fingers crossed.
2016-12-15 11:05 GMT+00:00 James Cummings
mailto:James.Cummings@it.ox.ac.uk>: I think we just encountered that, fixed the conflicts, and have merged release-7.42.0 to master.
https://github.com/TEIC/Stylesheets/commit/4ea31e1ce04431ee49709141b81599760... https://github.com/TEIC/Stylesheets/commit/4ea31e1ce04431ee49709141b81599760...
Stylesheets waiting to build in Victoria.
-James
On 15/12/16 11:00, Hugh Cayless wrote:
Yeah, there's an interdependency that will mean broken builds no matter what you do, but it'll be better if the Stylesheets go first. The procedure should be exactly the same as for TEI, but I think there's an extra commit in the Stylesheets master that someone pushed by accident. That might entail a bit of extra work.
Sent from my phone.
On Dec 15, 2016, at 05:20, James Cummings
mailto:James.Cummings@it.ox.ac.uk> wrote: Hi all,
This is me announcing a temporary freeze on the release branch. (Step 3 on release day)
Magdalena and I are both sat in my office going through the steps. ;-)
Can someone remind me how we should go about merging the Stylesheets release branch to Stylesheets? I'm assuming we should merge in the stylesheets before doing so for TEI ... right? I remember there being some circular type problem there.
-James
-- Dr James Cummings, James.Cummings@it.ox.ac.uk mailto:James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford -- tei-council mailing list tei-council@lists.tei-c.org mailto:tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council 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 mailto:James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford -- tei-council mailing list tei-council@lists.tei-c.org mailto:tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived