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

Contrib nwchem 6.3 intel2014b #969

Merged
merged 5 commits into from Sep 6, 2014

Conversation

hajgato
Copy link
Collaborator

@hajgato hajgato commented Jul 14, 2014

Easyblock easybuilders/easybuild-easyblocks#441 is needed for compilation.

@hpcugentbot
Copy link
Contributor

Automatic reply from Jenkins: Can I test this?

@wpoely86
Copy link
Member

ok to test

…sybuild-easyconfigs into contrib_nwchem_6.3_intel2014b
@boegel
Copy link
Member

boegel commented Aug 1, 2014

@hajgato: can you sync this with current develop? you'll need to fix conflicts, since the merge is broken

If you're not sure how to handle that, let me know, I can do it for you and issue a PR to your branch.

@hajgato
Copy link
Collaborator Author

hajgato commented Aug 1, 2014

Am am not sure how to do that.

@boegel
Copy link
Member

boegel commented Aug 1, 2014

In short:

git checkout develop
git pull origin develop   # assuming origin points to hpcugent
git checkout contrib_nwchem_6.3_intel2014b
git merge develop
# fix conflicts by editing files
gc -a

And then push again to your repo. I've done this now, in this case there were no conflicts (git will tell you if there are). So, I'm not quite sure why the merge was broken.
I've done this for you, see hajgato#2

@boegel
Copy link
Member

boegel commented Sep 6, 2014

Test report by @boegel
SUCCESS
Build succeeded for 1 out of 1
Linux SL 6.5, Intel(R) Xeon(R) CPU E5-2670 0 @ 2.60GHz, Python 2.6.6
See https://gist.github.com/7e1a10894268403e15d6 for a full test report.

@boegel
Copy link
Member

boegel commented Sep 6, 2014

Tested on top of easybuilders/easybuild-easyblocks#441, looking excellent, thanks @hajgato!

boegel added a commit that referenced this pull request Sep 6, 2014
@boegel boegel merged commit 8238f4b into easybuilders:develop Sep 6, 2014
@hajgato hajgato deleted the contrib_nwchem_6.3_intel2014b branch October 16, 2014 08:40
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.

None yet

4 participants