search

dasher-project / dasher

Dasher
http://www.inference.phy.cam.ac.uk/dasher/
GNU General Public License v2.0
158 stars 45 forks source link

Added continuous integration for Java #139

Closed alper-oner closed 6 years ago

alper-oner commented 6 years ago

Reference: #132 I added gradle where the java files are located. I added continuous integration for Java with Travis-CI.

cagdasgerede commented 6 years ago

You still need to remove .gradle files from the pull request.

Also, you need to do a pull from the repository to your repository because there were updates to the repository (you can see that it says "This branch has conflicts that must be resolved".

So add an upstream

git remote add upstream https://github.com/dasher-project/dasher.git

then

git fetch upstream

then

git merge upstream/master

You may get merge conflicts because of .travis.yml file other files. Fix these.

Note that you may need to check out: https://medium.com/google-developers/hacks-i-did-to-use-travis-ci-with-firebase-ios-quickstarts-da67c4986f29

because we have both Linux and Java using travisci.

Finally, push to your repository (origin)

git push origin master
cagdasgerede commented 6 years ago

May be it may make sense to use circle ci instead of travisci since it causes a conflict with linux.

Can you use circleci? I assume it must be similar to set up.

alper-oner commented 6 years ago

I updated .gitignore for ./gradle, removed TravisCi and set up CircleCi and updated README.md.

cagdasgerede commented 6 years ago

Thank you! That looks great!