diff --git a/.github/workflows/benchmarking.yml b/.github/workflows/benchmarking.yml index 25fb47ee..ada38199 100644 --- a/.github/workflows/benchmarking.yml +++ b/.github/workflows/benchmarking.yml @@ -2,7 +2,7 @@ name: Benchmarking -on: push +on: [push, pull_request] jobs: build: diff --git a/.gitignore b/.gitignore index 13739ff0..3f748395 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ build/ carball.egg* dist/ *ipynb* +protobuf-* +carball/generated/binaries/protoc !/carball/tests/replays/ .vscode diff --git a/README.md b/README.md index df010d45..d3bb7e9f 100644 --- a/README.md +++ b/README.md @@ -20,23 +20,6 @@ Carball is an open-source project that combines multiple tools for decompiling R `pip install carball` -#### Clone for development - -##### Windows -``` -git clone https://github.com/SaltieRL/carball -cd carball/ -python init.py -``` - -##### Linux -``` -git clone https://github.com/SaltieRL/carball -cd carball/ -./_travis/install-protoc.sh -python init.py -``` - ## Examples / Usage One of the main data structures used in carball is the pandas.DataFrame, to learn more, see [its wiki page](https://github.com/SaltieRL/carball/wiki/data_frame). @@ -175,6 +158,28 @@ Fix: ## Developing Everyone is welcome to join the carball (and calculated.gg) project! Even if you are a beginner, this can be used as an opportunity to learn more - you just need to be willing to learn and contribute. +#### Clone for development + +##### Windows +``` +git clone https://github.com/SaltieRL/carball +cd carball/ +python init.py +``` + +##### Linux +``` +git clone https://github.com/SaltieRL/carball +cd carball/ +chmod +x _travis/install-protoc.sh +./_travis/install-protoc.sh 2.6.1 +mkdir -p carball/generated/binaries/.libs/ +ln -s ../../../protobuf-2.6.1/src/.libs/ carball/generated/binaries/ +pip3 install -r requirements.txt +pip3 install -r requirements-test.txt +python3 init.py +``` + ### Usage of GitHub All contributions end up on the carball repository. If you are new to the project you are required to use your own fork for first changes. If you do not have any previous git / github experience that is completely fine - we can help with it. If we believe that you are comitted to working on the project and have experience in git we may give you write access so that you no longer have to use a fork. Nonetheless, please wait until your contrubtion is ready for a review to make the pull request because that will save resources for our tests and reduce spam. @@ -202,5 +207,5 @@ If you wish to see the current carball analysis performance, it is split into 5 * A full game of rumble - to test rumble performance. * [RLCS](https://saltierl.github.io/carball/dev/bench/oce_rlcs/) * A full soccar RLCS game. -* [RLCS (Intensive)](https://saltierl.github.io/carball/dev/bench/oce_rlcs_intensive/) +* [RLCS (Intensive)](https://saltierl.github.io/carball/dev/bench/intensive_oce_rlcs/) * A full soccar RLCS game, but run with the intense analysis flag. diff --git a/_travis/install-protoc.sh b/_travis/install-protoc.sh old mode 100644 new mode 100755 diff --git a/carball/generated/binaries/.libs b/carball/generated/binaries/.libs new file mode 120000 index 00000000..8d81959f --- /dev/null +++ b/carball/generated/binaries/.libs @@ -0,0 +1 @@ +../../../protobuf-2.6.1/src/.libs/ \ No newline at end of file