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

Fixes to get GIEs working on Mac OS X. #3978

Merged
merged 1 commit into from Apr 26, 2017

Conversation

Projects
None yet
5 participants
@jmchilton
Copy link
Member

commented Apr 26, 2017

One of the upsides of selling out on all of my previous values I guess.

  • Fix logic error related to config parsing (OS non-specific).
  • Don't trust GatewayAddress from Docker if on Mac OS X - it is probably a Docker host VM specific address.
  • Update sqlite dependency for the newest version of Node available from Mac OS X Homebrew.
  • Add a little blurb about how to configure galaxy_infrastructure_url in this case.
Fixes to get IEs working on Mac OS X.
- Fix logic error related to config parsing (OS non-specific).
- Don't trust GatewayAddress from Docker if on Mac OS X - it is probably a Docker host VM specific address.
- Update sqlite dependency for the newest version of Node available from Mac OS X Homebrew.
- Add a little blurb about how to configure galaxy_infrastructure_url in this case.

@jmchilton jmchilton added this to the 17.05 milestone Apr 26, 2017

@galaxybot galaxybot added the triage label Apr 26, 2017

@erasche

This comment has been minimized.

Copy link
Member

commented Apr 26, 2017

Since I haven't sold out, can't test, but looks fine.

@bgruening

This comment has been minimized.

Copy link
Member

commented Apr 26, 2017

Looks good to me as well!

@bgruening bgruening merged commit 910c22b into galaxyproject:dev Apr 26, 2017

4 of 5 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
api test Build finished. 274 tests run, 0 skipped, 0 failed.
Details
framework test Build finished. 148 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 34 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 579 tests run, 0 skipped, 0 failed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.