Merge pull request #22 from avast/CI_cleanup

Splitting CI tests for better result handling in README. Added anothe…

.github/workflows/develop_by_makefile.yml

@@ -0,0 +1,28 @@
+name: Develop
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python: [ 3.9 ]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Install Tox and any other packages
+      run: pip install tox
+    - name: Run check
+      run: make check
+
+

.github/workflows/main_by_makefile.yml

@@ -1,10 +1,10 @@
-name: Makefile CI
+name: Main
 
 on:
   push:
-    branches: [ main, develop ]
+    branches: [ main ]
   pull_request:
-    branches: [ main, develop ]
+    branches: [ main ]
 
 jobs:
   build:

README.md

@@ -1,4 +1,5 @@
-![main branch test](https://github.com/avast/PurpleDome/actions/workflows/makefile.yml/badge.svg?branch=main)
+![main branch test](https://github.com/avast/PurpleDome/actions/workflows/main_by_makefile.yml/badge.svg?branch=main)
+![develop branch test](https://github.com/avast/PurpleDome/actions/workflows/develop_by_makefile.yml/badge.svg?branch=develop)
 
 # PurpleDome creates simulated systems which hack each other 
 
@@ -120,20 +121,26 @@ Short:
 
 Branching your own feature branch
 
+```
 $ git checkout development
 $ git pull --rebase=preserve
 $ git checkout -b my_feature
+```
 
 Do some coding, commit.
 
 Rebase before pushing
 
+```
 $ git checkout development
 $ git pull --rebase=preserve
 $ git checkout my_feature
 $ git rebase development
+```
 
 Code review will be happening on github. If everything is nice, you should squash the several commits you made into one (so one commit = one feature). This will make code management and debugging a lot simpler when you commit is added to develop and main branches
 
-.. TODO: git rebase --interactive
+```
-git push --force
+git rebase --interactive
+git push --force
+```