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

Update the Travis script to run on Linux and OS X #36

Merged
merged 15 commits into from
Jan 31, 2019

Conversation

Saldivarcher
Copy link
Contributor

In this commit, the .travis.yml (Travis build script) has been
updated to build and test on both Linux and OS X. To achieve this
the script portion of the script, checks for the os type and runs
the correct provisioning script accordingly. Another change is, matrix
was added, and this sets the correct environment variables depending on
the os.

In this commit, the `.travis.yml` (Travis build script) has been
updated to build and test on both Linux and OS X. To achieve this
the `script` portion of the script, checks for the os type and runs
the correct provisioning script accordingly. Another change is, `matrix`
was added, and this sets the correct environment variables depending on
the os.
@thedataking
Copy link
Contributor

You seem to be mixing two styles in the multi-os guidelines, one style is:

os:
  - linux
  - osx

the other is the "matrix" style, e.g.:

matrix:
  include:
    - os: linux
    - os: osx

why is that?

@Saldivarcher
Copy link
Contributor Author

Saldivarcher commented Jan 24, 2019

@thedataking that's what I seen from various other sources (a lot of the rust-lang projects mix the two), so I followed suit. Although if that's not okay, the matrix style will be the one to use.

@thedataking
Copy link
Contributor

@miguelsaldivar I had two minor comments, other than that, this looks ready to merge!

.travis.yml Outdated Show resolved Hide resolved
.travis.yml Outdated Show resolved Hide resolved
.travis.yml Outdated
- ./scripts/provision_mac.sh
- |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
# - HOMEBREW_NO_AUTO_UPDATE=1 brew upgrade python
Copy link
Contributor

Choose a reason for hiding this comment

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

Should be # HOMEBREW_NO_AUTO_UPDATE=1 brew upgrade python. Otherwise, uncommenting the line would not work.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yup, that makes sense. 👍

@thedataking thedataking reopened this Jan 31, 2019
@thedataking thedataking merged commit c9e9d4d into immunant:master Jan 31, 2019
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