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

Reintroduce some macOS builds to Travis-CI #1810

Merged
merged 2 commits into from
Jul 27, 2020
Merged

Conversation

kulp
Copy link
Member

@kulp kulp commented Jun 21, 2020

Closes #1072 by running a few critical jobs on macOS, but not the whole matrix.

In my experience with Travis in general in the last few years, there has not been a lack of macOS builders as was the case when #1072 (comment) was written.

This PR would increase the number of Travis jobs by four, from 37 to 41 31 to 35.

Along the way I refactored ci/before_install.sh, making it capable of handling LLVM 9.0.1+ (including 10.0.0). Some of the changes there are not strictly necessary to get macOS builds working again, so let me know if I should pare down the list of changes.

The most significant change here was to set LIBCLANG_PATH instead of only DYLD_LIBRARY_PATH-plus-a-copy. Perhaps it would be better not to set LIBCLANG_PATH if we could avoid it.

ci/before_install.sh Outdated Show resolved Hide resolved
@kulp

This comment has been minimized.

@kulp kulp force-pushed the macos-travis branch 3 times, most recently from 07002ef to aac1862 Compare July 2, 2020 17:39
@kulp kulp marked this pull request as ready for review July 2, 2020 18:34
@kulp

This comment has been minimized.

@kulp kulp requested a review from emilio July 3, 2020 15:44
kulp added 2 commits July 26, 2020 17:33
Remove needless pushd that was causing trouble with `set -e`

Remove old osx workaround for rvm

Add shebang line

Fix target descriptor

Support LLVM versions 9.0.1+
@kulp
Copy link
Member Author

kulp commented Jul 27, 2020

@emilio, the CI issues were fixed by rebasing. Consider reviewing this again, at your leisure.

Copy link
Contributor

@emilio emilio left a comment

Choose a reason for hiding this comment

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

This looks good thanks! Just a curious question.

ci/before_install.sh Show resolved Hide resolved
@emilio emilio merged commit b424c17 into rust-lang:master Jul 27, 2020
@kulp kulp deleted the macos-travis branch July 27, 2020 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

macOS continuous integration
3 participants