Hi all, We've now taken the following actions: 1. Created a new branch release-7.50.1 from the released branch. 2. Cherry-picked the two commits for the fix into that branch. 3. Updated the VERSION file to show 7.50.1. 4. Pushed that branch up to GitHub. 5. Created a Jenkins job Stylesheets-release-7.50.1 on my Jenkins to build it: https://teijenkins.hcmc.uvic.ca/job/Stylesheets-release-7.50.1/ If Jenkins builds this OK, and everyone is happy with the results, we can then merge release-7.50.1 into released and do an interim release from it, assuming P5 builds work as expected. Cheers, Martin On 2020-09-14 12:27 a.m., Peter Stadler wrote:

I agree with Hugh and I think we should simply follow our procedure to create a branch release-7.50.1 and do the changes (incl VERSION, changelog etc.) in there. When it builds ok and we checked the fixed functionality we merge to released and create a new release on GitHub.

Cheers Peter

...

Am 11.09.2020 um 19:17 schrieb Hugh Cayless :

So maybe don't do this in released, in case it doesn't work and needs tweaking. I'd get it working in a branch and then merge it.

On Fri, Sep 11, 2020 at 12:19 PM Syd Bauman wrote: With Martin's help, I have just fixed an egregious error in Stylesheets/bin/transformtei, which is a bad problem, but was an easy fix. (The problem was that it would always fail to find the default p5subset.xml if you started from a directory outside the Stylesheets/ tree.)

I have pushed the change to the 'dev' branch. But this is a serious enough problem that the fix should be release, in Martin's humble opinion. (Mine, too.)

We probably don't want to release the _other_ changes that have been made to dev since the last release. (At least, Martin doesn't. I kinda like them. :-)

So we think the steps should be to cherry-pick that particular fix into the release branch.

1. git checkout released 2. git cherry-pick c615d52 3. change VERSION to 7.50.1 4. run tests, pray there are no errors 5. git commit # to get the new VERSION file 6. git push 7. Hope Stylesheets released branch build works on Jenkins 8. Read TCW 22 and figure out how to actually release the new package. 9. Read TCW 22 and figure out how to release the new oXygen package (may need to kick Jenkins to get it to build, but at least on Martin's Jenkins it should go on its own after the TEIP5-relased job completes successfully) 10. Update TCW 22 as needed to cover this process. (We don't think there has been a separate Stylesheets release for a long time.)

_______________________________________________ Tei-council mailing list Tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council _______________________________________________ Tei-council mailing list Tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council

_______________________________________________ Tei-council mailing list Tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council

-- ------------------------------------- Humanities Computing and Media Centre University of Victoria mholmes@uvic.ca

Hi Peter, We also need to release the stable Oxygen plugin. I hadn't realized (or I didn't remember) that my build is not doing the documentation; I think the documentation requires an Oxygen license, which might be the reason, although I'm not sure. My Jenkins jobs have diverged from yours because I have stuck with the original Jenkins pattern of having the workspace folder in the job folder rather than somewhere else, mainly for convenience and easier tracking of disk usage by jobs. I'll take a look at your job configuration and update mine to see if it will work. But I'm not really in favour of relying on Oxygen to build the Stylesheets documentation; I think we've talked about this before, and there was a vague plan to write our own processing for it, but of course it's way down the priority list. Mainly, though, I would like to take this as an opportunity to document in detail the process for patching and releasing an interim version of the Stylesheets in between P5 releases, since that seems like something that might happen more than once or twice, and used to happen a lot when Sebastian was alive. Cheers, Martin On 2020-09-24 1:05 a.m., Peter Stadler wrote:

Hi Martin,

sorry for being so late: I just updated the Stylesheets release job on the Paderborn Jenkins because I saw that your’s not building the Stylesheets documentation. That in turn reminded me that we would need not only to release on GitHub, but also

a) TEI website b) Debian packages c) SourceForge

Anything I missed?

Cheers Peter

...

Am 18.09.2020 um 17:52 schrieb Martin Holmes :

Hi all,

We've now taken the following actions:

1. Created a new branch release-7.50.1 from the released branch.

2. Cherry-picked the two commits for the fix into that branch.

3. Updated the VERSION file to show 7.50.1.

4. Pushed that branch up to GitHub.

5. Created a Jenkins job Stylesheets-release-7.50.1 on my Jenkins to build it: https://teijenkins.hcmc.uvic.ca/job/Stylesheets-release-7.50.1/

If Jenkins builds this OK, and everyone is happy with the results, we can then merge release-7.50.1 into released and do an interim release from it, assuming P5 builds work as expected.

Cheers, Martin

On 2020-09-14 12:27 a.m., Peter Stadler wrote:

...

I agree with Hugh and I think we should simply follow our procedure to create a branch release-7.50.1 and do the changes (incl VERSION, changelog etc.) in there. When it builds ok and we checked the fixed functionality we merge to released and create a new release on GitHub. Cheers Peter

...

Am 11.09.2020 um 19:17 schrieb Hugh Cayless :

So maybe don't do this in released, in case it doesn't work and needs tweaking. I'd get it working in a branch and then merge it.

On Fri, Sep 11, 2020 at 12:19 PM Syd Bauman wrote: With Martin's help, I have just fixed an egregious error in Stylesheets/bin/transformtei, which is a bad problem, but was an easy fix. (The problem was that it would always fail to find the default p5subset.xml if you started from a directory outside the Stylesheets/ tree.)

I have pushed the change to the 'dev' branch. But this is a serious enough problem that the fix should be release, in Martin's humble opinion. (Mine, too.)

We probably don't want to release the _other_ changes that have been made to dev since the last release. (At least, Martin doesn't. I kinda like them. :-)

So we think the steps should be to cherry-pick that particular fix into the release branch.

1. git checkout released 2. git cherry-pick c615d52 3. change VERSION to 7.50.1 4. run tests, pray there are no errors 5. git commit # to get the new VERSION file 6. git push 7. Hope Stylesheets released branch build works on Jenkins 8. Read TCW 22 and figure out how to actually release the new package. 9. Read TCW 22 and figure out how to release the new oXygen package (may need to kick Jenkins to get it to build, but at least on Martin's Jenkins it should go on its own after the TEIP5-relased job completes successfully) 10. Update TCW 22 as needed to cover this process. (We don't think there has been a separate Stylesheets release for a long time.)

_______________________________________________ Tei-council mailing list Tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council _______________________________________________ Tei-council mailing list Tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council

---

Tei-council mailing list Tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council

-- ------------------------------------- Humanities Computing and Media Centre University of Victoria mholmes@uvic.ca _______________________________________________ Tei-council mailing list Tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council

_______________________________________________ Tei-council mailing list Tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council

-- ------------------------------------- Humanities Computing and Media Centre University of Victoria mholmes@uvic.ca