Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Travis CI integration #262

Merged
merged 11 commits into from
Nov 29, 2017
Merged

Travis CI integration #262

merged 11 commits into from
Nov 29, 2017

Conversation

palemieux
Copy link
Contributor

  • a complete specification is generated by 'ant build' under the build/ directory
  • Travis stores the complete specification on a sister branch called ${current-branch-name}-build
  • the build target expands keywords
  • build artifacts are git-ignored

spec/build.xml Outdated
<mkdir dir="${build.target}/xsd"/>
<copy file="${html.dir}/${html.name}" tofile="${build.target}/index.html"/>
<copy todir="${build.target}/images">
<fileset dir="${basedir}/images" includes="*.png"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least in TTML2 there are SVG images too

Copy link
Contributor

@nigelmegitt nigelmegitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is much better than what we had before, so I'm keen to merge it soon even if there are further tweaks that could be made.

I notice that it is possible to have build branch name clashes, since the same branch name can be reused (I know!), but this is unlikely to be a significant problem.

@palemieux palemieux self-assigned this Nov 24, 2017
@palemieux palemieux changed the base branch from gh-pages to master November 27, 2017 18:36
@palemieux palemieux merged commit 95183e0 into master Nov 29, 2017
Copy link
Contributor

@nigelmegitt nigelmegitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's really hard to review this commit on the GitHub web page because it treats the indentation changes as huge blocks of removed and added lines. Is it just changing the indentation, or were there other changes too?

@palemieux
Copy link
Contributor Author

Is it just changing the indentation, or were there other changes too?

There were other changes, including:

  • relocating targets within the file
  • removing targets that committed the built specification

git diff -w can be used to view the changes ignoring whitespace.

@nigelmegitt
Copy link
Contributor

Ah, thanks, that was helpful! All looks fine to me. What action is needed about the lines that look like:

<!-- DO NOT USE AS-IS -->

?

@palemieux
Copy link
Contributor Author

These targets need to be at the very least modified — since they have hardcoded pub names. I plan on getting to them as we get closer to publication. In the meantime they should not be used.

@nigelmegitt
Copy link
Contributor

OK, no problem, the build script doesn't use them anyway.

@palemieux
Copy link
Contributor Author

The build target does not use the sg and rg targets either. I thought I would keep mods to a minimum for now. The script will benefit from additional maintenance over time.

@palemieux palemieux deleted the feature-Travis-CI-integration branch December 26, 2017 22:03
@palemieux palemieux removed the pr open label Jan 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants