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.

Sign up for GitHub

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

Jump to bottom

Test re-enabling osx travis #11622

Merged
merged 1 commit into from
Jun 17, 2015
Merged

Test re-enabling osx travis #11622

merged 1 commit into from
Jun 17, 2015

Conversation

tkelman
Copy link
Contributor

@tkelman tkelman commented Jun 9, 2015

Following up on #11614, we might be able to get away with turning osx Travis back on now that we're running the tests with a release build of julia instead of debug. Also some other grab-bag cleanup of Travis:

Add local.ji test with julia-debug

Don't build rmath on Travis, it's unused in base (the way in which I'm doing this via STAGE2_DEPS is a little hacky, I'll admit - we have no other way of turning off the rmath build right now, aside from disabling gpl libraries completely)

Cleanup make flags and apt-get packages for zlib and rmath that don't do anything

Add timestamps to make install step

Use parallel make

tkelman
tkelman reviewed Jun 9, 2015
View reviewed changes
.travis.yml
script:
- make check-whitespace || exit 1
- make $BUILDOPTS -C base version_git.jl.phony
- make $BUILDOPTS NO_GIT=1 prefix=/tmp/julia install
- make $BUILDOPTS NO_GIT=1 prefix=/tmp/julia install | moreutils/ts -s "%.s"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

blatantly ripped off from https://github.com/mlubin/JuMPSupplement/blob/master/acpower/README.md, thanks for the idea @mlubin

Copy link
Member

Choose a reason for hiding this comment

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

That ts really made life quite nice

Copy link
Contributor Author

Choose a reason for hiding this comment

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

annoyingly the -s relative-to-start-time flag isn't there yet in the versions packaged in ubuntu, but at least it's just a perl script and can be run from a git clone of the source

@tkelman tkelman mentioned this pull request Jun 11, 2015
Merged
@tkelman
Test re-enabling osx travis
1c69d63 
Also add local.ji test with julia-debug

Don't build rmath on Travis, it's unused in base

Cleanup make flags and apt-get packages for zlib and rmath that don't do anything

Add timestamps to make install step

Use parallel make on Travis

[av skip]
@tkelman
Copy link
Contributor Author

tkelman commented Jun 14, 2015

Thoughts, anybody?

@yuyichao
Copy link
Contributor

Maybe removing USE_SYSTEM_RMATH completely ? (i.e. here)

@tkelman
Copy link
Contributor Author

tkelman commented Jun 14, 2015

thought about it, but didn't feel like touching macports (should we just delete that?)

@yuyichao
Copy link
Contributor

That's what I thought, unless there's sth subtle here...

(I guess this is not what this PR is for. I just saw the removal of the option and found another use of it with git grep.)

@ViralBShah
Copy link
Member

Perhaps Distribution.jl testing may fail if we do not build RMath. We should just put it into BinDeps reliably.

@yuyichao
Copy link
Contributor

@ViralBShah I think this is not about disabling RMath. It just seems to be an unused make option from the output below.

yuyichao% git grep USE_SYSTEM_RMATH | cat
Make.inc:USE_SYSTEM_RMATH=0
contrib/mac/macports.make:              USE_SYSTEM_RMATH=0 \

@tkelman
Copy link
Contributor Author

tkelman commented Jun 14, 2015

USE_SYSTEM_RMATH doesn't actually work so I'm taking it out of Make.inc, and I'm not building it on Travis since nothing on Travis tests it. This doesn't change the fact that the library is still getting built into the binaries from the buildbots, that will still be the case for now but it would be great to transition rmath over to using bindeps instead of being part of base for 0.5.

@tkelman
Copy link
Contributor Author

tkelman commented Jun 17, 2015

I'm gonna merge, testing on more platforms is a good thing. We can comment it back out if it still times out regularly.

tkelman added a commit that referenced this pull request Jun 17, 2015
@tkelman
Merge pull request #11622 from JuliaLang/tk/osxtravis
dbe94d1 
Test re-enabling osx travis
@tkelman tkelman merged commit dbe94d1 into master Jun 17, 2015
@tkelman tkelman deleted the tk/osxtravis branch June 17, 2015 06:26
@tkelman tkelman mentioned this pull request Jun 17, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@tkelman @yuyichao @ViralBShah @IainNZ