Closed crowder closed 7 years ago
I also tidied up the indentation on these lines (which were spaces instead of tabs, contrary to the rest of the file). Apologies if that b0rks history. I can submit as a separate commit, at least, if necessary.
When I was looking at these tests running the day I submitted, they all passed. I don't know how that changed, is there a way to get them rerun?
@crowder Can you integrate the Travis CI for OSX in your PR from here: https://github.com/psibi/download/blob/osx-fix/.travis.yml ? That will test properly for Apple. The test is failing because of my wrong Travis CI configuration and I haven't got time yet to fix it.
@crowder Finally got some time to integrate OSX test into the repo. But unfortunately, your patch doesn't seem to work: https://travis-ci.org/psibi/download/builds/171654945 If you can provide a fix for this, I can merge it.
@crowder It doesn't work for 7.10.3. But it does work for 8.0.1. :+1:
I have merged your changes here: https://github.com/psibi/download/commit/a2276e9a91c49060823bdc9cf95013e8612e8743
Closing this PR. Thanks! I would still like it to be fixed for 7.10.3.
Some quick Googling seems to suggest that The Right Way to determine we're building on Mac OS X is
#ifdef __APPLE__ && __MACH__
but I don't think we want this to be
__MACH__
-only, so I used just__APPLE__
. Lemme know if it introduces other issues.Fixes #4