Skip to content
This repository was archived by the owner on Mar 24, 2026. It is now read-only.

Update: Remove bash profile, Closes #1314 by replacement#1478

Merged
hamiltont merged 99 commits intoTechEmpower:masterfrom
LadyMozzarella:lgratrix-remove-bash-profile
Apr 4, 2015
Merged

Update: Remove bash profile, Closes #1314 by replacement#1478
hamiltont merged 99 commits intoTechEmpower:masterfrom
LadyMozzarella:lgratrix-remove-bash-profile

Conversation

@LadyMozzarella
Copy link
Copy Markdown
Contributor

Replacement for #1314

Updates made based off of comments made on #1314 on top of @lgratrix-techempower's commits.

@LadyMozzarella
Copy link
Copy Markdown
Contributor Author

PHP tests are failing for me right now (hence the postpone label). Will look into issue tomorrow, but want to get an idea of what all needs to be fixed up for a merge. :)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Please add this comment back - it is important to note that certain special variables are not visible here (such as PATH, LD_LIBRARY_PATH, etc)

lgratrix-techempower and others added 14 commits April 3, 2015 14:53
- Make minor adjustments after merge conflict, clean up
- Load the benchmark_profile again
- Move llvm-dev installation to sudo apt-get group
- Set default location of PHP for composer.
- Export JAVA_HOME where sbt is used
- This is the 3rd commit message:
- Add removed comments with guidance back in
- This is the 4th commit message:
- Use COMPOSER_HOME and make it consistent
- This is the 5th commit message:
- Export URWEB_HOME
- Add missing export for C++/wt postgres
- Move exports from bash_profile for Python/pyramid
@LadyMozzarella LadyMozzarella force-pushed the lgratrix-remove-bash-profile branch from 50fd114 to 282bec9 Compare April 3, 2015 22:04
@LadyMozzarella
Copy link
Copy Markdown
Contributor Author

This PR is a beast. I think he's updated pretty well now. I also think I've covered all of the comments you guys have left. If you see anything wild in there, please let me know. I'd like to try and get this one merged in ASAP because it's crazy large and merge conflicts so easy. Hopefully this Travis run is on point.
crosses fingers

@hamiltont
Copy link
Copy Markdown
Contributor

I've read it carefully - it appears totally correct to me at this point, so I'm good to merge even if there's one minor regression somewhere

bash_profile contents placed into install files and setup files for:
- API-Hour
- Cherrypy
- Django
@LadyMozzarella
Copy link
Copy Markdown
Contributor Author

Okay. I looked over the Travis output and found that there were three python frameworks added after Lita made her commits (thank you, Travis!), so I updated those to remove their bash_profiles. There were also three that were breaking and I think it's just because some of the exports were needed in either certain install or setup scripts. Overall, it appeared that those were the only ones that were breaking on the last Travis run.

Frameworks that I'm paying attention to:

  • C++/ULib
  • C++/wt
  • JavaScript/NodeJs
  • Python/API-Hour
  • Python/Cherrypy
  • Python/Django

I've taken notes on which ones broke the last round on Travis, so I'm prepared to fix those up if there are further problems after merge - or we can wait for this next run on Travis. :)

@hamiltont
Copy link
Copy Markdown
Contributor

hamiltont commented Apr 4, 2015 via email

@LadyMozzarella
Copy link
Copy Markdown
Contributor Author

Looks like they're all good except C++/wt in the last run. Do you mind doing the merge @hamiltont? :)

hamiltont added a commit that referenced this pull request Apr 4, 2015
@hamiltont hamiltont merged commit 97a0934 into TechEmpower:master Apr 4, 2015
@LadyMozzarella LadyMozzarella deleted the lgratrix-remove-bash-profile branch April 13, 2015 22:32
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants