Would this be a manual job that we kick off only when releasing? Or one that happens each time? -James On 29/10/15 12:23, Martin Holmes wrote:

I've just changed my Jinks to build dev branches. However, this now means we have no Jenkins build that we can use as a distribution source when we do a release. We will need to add another job, I think.

Cheers, Martin

On 2015-10-29 10:33 AM, Hugh Cayless wrote:

...

To switch to work on the dev branch, you should be able to just:

git fetch git checkout dev

Future pushes should be to dev, so

git push origin dev

You need to do this in both the TEI and Stylesheets repos.

Thanks all, Hugh

-- Dr James Cummings, James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford

If it could do it when we push to master that would make more sense. -James On 29/10/15 14:38, Raffaele Viglianti wrote:

Manual would make more sense because we don't want a stable master to be rebuilt every time we push to the dev branch. Unless Jenkins can kick off that build only when we push to master. Raff

On Oct 29, 2015 2:23 PM, "James Cummings" mailto:James.Cummings@it.ox.ac.uk> wrote:

Would this be a manual job that we kick off only when releasing? Or one that happens each time?

-James

On 29/10/15 12:23, Martin Holmes wrote:

I've just changed my Jinks to build dev branches. However, this now means we have no Jenkins build that we can use as a distribution source when we do a release. We will need to add another job, I think.

Cheers, Martin

On 2015-10-29 10:33 AM, Hugh Cayless wrote:

To switch to work on the dev branch, you should be able to just:

git fetch git checkout dev

Future pushes should be to dev, so

git push origin dev

You need to do this in both the TEI and Stylesheets repos.

Thanks all, Hugh

-- 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

PLEASE NOTE: postings to this list are publicly archived

-- Dr James Cummings, James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford

Hi Martin. To do this I just changed the configuration for the following jobs: TEIP5 TEIP5-Documentation TEIP5-Test Stylesheets to be */dev instead of */master Is there anything else I need to do? -James On 29/10/15 12:23, Martin Holmes wrote:

I've just changed my Jinks to build dev branches. However, this now means we have no Jenkins build that we can use as a distribution source when we do a release. We will need to add another job, I think.

Cheers, Martin

On 2015-10-29 10:33 AM, Hugh Cayless wrote:

...

To switch to work on the dev branch, you should be able to just:

git fetch git checkout dev

Future pushes should be to dev, so

git push origin dev

You need to do this in both the TEI and Stylesheets repos.

Thanks all, Hugh

-- Dr James Cummings, James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford

An update to Jenkins which I installed yesterday has called me out on my fulsome praise of its stability. There's a bug in it: https://issues.jenkins-ci.org/browse/JENKINS-31217 which causes the log file to show multiple instances of "No JDK named ‘null’ found". As far as I can see, though, these cause no actual problem. In other words, they're not the reason the Stylesheets build is broken. They're also not the reason the Tests and P5 are unstable; that has something to do with an xsd schema. Cheers, Martin On 2015-10-29 08:41 PM, Martin Holmes wrote:

I don't think there's anything else to do. If I could figure out what it means (in terms of archivable artifacts) to build more than one branch, I'd suggest we have P5 build both dev and master, but I would assume that would cause one to overwrite the other.

How's your Jinks for disk space? Mine is a bit low, so I'm going to get it expanded when I go back. I'll have space for an extra P5 Master job then. Could yours do the same? It would build very rarely, so as long as theirs disk space for the artifacts it wouldn't be much of a drag on the system.

Cheers, Martin

On 2015-10-29 05:55 PM, James Cummings wrote:

...

Hi Martin.

To do this I just changed the configuration for the following jobs:

TEIP5 TEIP5-Documentation TEIP5-Test Stylesheets

to be */dev instead of */master

Is there anything else I need to do?

-James

On 29/10/15 12:23, Martin Holmes wrote:

...

I've just changed my Jinks to build dev branches. However, this now means we have no Jenkins build that we can use as a distribution source when we do a release. We will need to add another job, I think.

Cheers, Martin

On 2015-10-29 10:33 AM, Hugh Cayless wrote:

...

To switch to work on the dev branch, you should be able to just:

git fetch git checkout dev

Future pushes should be to dev, so

git push origin dev

You need to do this in both the TEI and Stylesheets repos.

Thanks all, Hugh

Dunno. Clone again?

On Oct 29, 2015, at 14:26 , James Cummings wrote:

On 29/10/15 10:33, Hugh Cayless wrote:

...

git fetch git checkout dev

When I attempt this it seems to claim that I've a conflict that needs to be merged with everything in the repo. I've made no changes.

-James

-- Dr James Cummings, James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford -- 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